summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Dawson <brucedawson@google.com>2015-04-09 13:44:54 -0700
committerBruce Dawson <brucedawson@google.com>2015-04-09 13:44:54 -0700
commit70476c21026f533ffb916b6a7ce387639f34e696 (patch)
treeb58290a30f9d1363093a88e6203a7e7b0798da62
parent308e05e5f06bd8daabaed12c211f6e072810f8de (diff)
downloadpdfium-70476c21026f533ffb916b6a7ce387639f34e696.tar.xz
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. R=tsepez@chromium.org BUG=440500 Review URL: https://codereview.chromium.org/1078513002
-rw-r--r--.gitignore3
-rw-r--r--fpdfsdk/src/fpdfsdkdll.rc4
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 529e8882a1..886dba9a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ Makefile
.DS_Store
.gclient
.gclient_entries
+*.aps
*.filters
*.mk
*.opensdf
@@ -20,4 +21,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