summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-09-26 16:24:49 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-27 01:04:13 +0000
commit698aed79d6ad6e8e3a0c7a500c108d69f944b82d (patch)
treefbf7e66e0a2ec096561cd0ba5d3c4d577cd64667 /third_party
parent3070e94f608f36e7312fad2d471e3d7546f82ca2 (diff)
downloadpdfium-698aed79d6ad6e8e3a0c7a500c108d69f944b82d.tar.xz
Cleanup FX macros
This CL renames the FX_OS defines to have _OS_ in their names and drops the _DESKTOP suffix. The FXM defines have been changed to just FX. Change-Id: Iab172fba541713b5f6d14fb8098baf68e3364c74 Reviewed-on: https://pdfium-review.googlesource.com/14833 Reviewed-by: Tom Sepez <tsepez@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libtiff/0000-build-config.patch2
-rw-r--r--third_party/libtiff/tiffconf.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libtiff/0000-build-config.patch b/third_party/libtiff/0000-build-config.patch
index 60f79b74b2..2989607412 100644
--- a/third_party/libtiff/0000-build-config.patch
+++ b/third_party/libtiff/0000-build-config.patch
@@ -100,7 +100,7 @@ diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
+//fx_system.h already include the string.h in ANSIC
+
+/* Define to 1 if you have the <search.h> header file. */
-+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER >= 1900
++#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ && _MSC_VER >= 1900
+// search.h is always available in VS 2015 and above, and may be
+// available in earlier versions.
+#define HAVE_SEARCH_H 1
diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
index 4d2d7c9d9a..4b7cc2d93a 100644
--- a/third_party/libtiff/tiffconf.h
+++ b/third_party/libtiff/tiffconf.h
@@ -29,7 +29,7 @@
//fx_system.h already include the string.h in ANSIC
/* Define to 1 if you have the <search.h> header file. */
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER >= 1900
+#if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ && _MSC_VER >= 1900
// search.h is always available in VS 2015 and above, and may be
// available in earlier versions.
#define HAVE_SEARCH_H 1