diff options
| author | Bruce Dawson <brucedawson@google.com> | 2015-04-09 13:52:02 -0700 |
|---|---|---|
| committer | Bruce Dawson <brucedawson@google.com> | 2015-04-09 13:52:02 -0700 |
| commit | 24a9eb6acf48a10717f03fd8ec0ac8e3df41edfc (patch) | |
| tree | 5150644e3b26fc35f1ce35631dffccaefe60ec29 | |
| parent | 30762ceda9db949550de6785b36dbe0d89c6d9d2 (diff) | |
| download | pdfium-24a9eb6acf48a10717f03fd8ec0ac8e3df41edfc.tar.xz | |
XFA port: Include windows.h instead of the MFC header afxres.h
VS 2015 RC ships without afxres.h, so fpdfsdkdll.rc fails to
compile. afxres.h is really intended for MFC apps so depending on
it is a bad idea anyway, so I changed both references to
windows.h. See http://stackoverflow.com/questions/1575559 for
some other perspective on this.
Ported from https://codereview.chromium.org/1078513002
TBR=tsepez@chromium.org
BUG=440500
Review URL: https://codereview.chromium.org/1073933002
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | fpdfsdk/src/fpdfsdkdll.rc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 623bf8dad7..91c35f18d8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ Makefile .DS_Store .gclient .gclient_entries +*.aps *.filters *.mk *.opensdf @@ -19,4 +20,4 @@ Makefile *.suo *.user *.vcxproj -*.xcodeproj
\ No newline at end of file +*.xcodeproj diff --git a/fpdfsdk/src/fpdfsdkdll.rc b/fpdfsdk/src/fpdfsdkdll.rc index f203f2e5be..fb5ddb8f7f 100644 --- a/fpdfsdk/src/fpdfsdkdll.rc +++ b/fpdfsdk/src/fpdfsdkdll.rc @@ -7,7 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" +#include "windows.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -80,7 +80,7 @@ END 2 TEXTINCLUDE MOVEABLE PURE BEGIN - "#include ""afxres.h""\r\n" + "#include ""windows.h""\r\n" "\0" END |