summaryrefslogtreecommitdiff
path: root/third_party/libtiff
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2016-01-07 16:31:49 -0800
committerLei Zhang <thestig@chromium.org>2016-01-07 16:31:49 -0800
commit4f966707b0ca01701cfdd761a164c6c856d35e6f (patch)
tree4562d3c74376e8c3f3d3b2a15a7753f53af649a9 /third_party/libtiff
parentab90f33999b122170f030aa25ef9c72f50286b09 (diff)
downloadpdfium-4f966707b0ca01701cfdd761a164c6c856d35e6f.tar.xz
XFA: Fix Windows build after upgrading libtiff, second attempt.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1567063003 .
Diffstat (limited to 'third_party/libtiff')
-rw-r--r--third_party/libtiff/0000-build-config.patch8
-rw-r--r--third_party/libtiff/tiffconf.h6
2 files changed, 1 insertions, 13 deletions
diff --git a/third_party/libtiff/0000-build-config.patch b/third_party/libtiff/0000-build-config.patch
index 8c773ab901..c59249c11b 100644
--- a/third_party/libtiff/0000-build-config.patch
+++ b/third_party/libtiff/0000-build-config.patch
@@ -92,7 +92,7 @@ diff a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c
diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
--- /dev/null
+++ b/third_party/libtiff/tiffconf.h
-@@ -0,0 +1,256 @@
+@@ -0,0 +1,250 @@
+/* libtiff/tiffconf.h. Generated by configure. */
+/*
+ Configuration defines for installed libtiff.
@@ -152,12 +152,6 @@ diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
+#define SIZEOF_UNSIGNED_LONG 4
+#endif
+
-+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900
-+#define HAVE_SNPRINTF 0
-+#else
-+#define HAVE_SNPRINTF 1
-+#endif
-+
+/* Signed 8-bit type */
+#define TIFF_INT8_T signed char
+
diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
index eb9161ded1..e36bde6571 100644
--- a/third_party/libtiff/tiffconf.h
+++ b/third_party/libtiff/tiffconf.h
@@ -57,12 +57,6 @@
#define SIZEOF_UNSIGNED_LONG 4
#endif
-#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ && _MSC_VER < 1900
-#define HAVE_SNPRINTF 0
-#else
-#define HAVE_SNPRINTF 1
-#endif
-
/* Signed 8-bit type */
#define TIFF_INT8_T signed char