3 files changed, 23 insertions, 1 deletions
diff --git a/third_party/libtiff/0001-build-config.patch b/third_party/libtiff/0001-build-config.patch
new file mode 100644
index 0000000000..c393154658
--- /dev/null
+++ b/third_party/libtiff/0001-build-config.patch
@@ -0,0 +1,17 @@
+diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
+index bcc0bc5..ca749da 100644
+--- a/third_party/libtiff/tiffconf.h
++++ b/third_party/libtiff/tiffconf.h
+@@ -39,7 +39,11 @@
+ //fx_system.h already include the string.h in ANSIC
+ 
+ /* Define to 1 if you have the <search.h> header file. */
+-/*#define HAVE_SEARCH_H 1 */
++#if _FXM_PLATFORM_ == _FXM_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
++#endif
+ 
+ /* The size of a `int', as computed by sizeof. */
+ /* According typedef int	int32_t; in the fx_system.h*/
diff --git a/third_party/libtiff/README.pdfium b/third_party/libtiff/README.pdfium
index bee4729556..c9b0f48407 100644
--- a/third_party/libtiff/README.pdfium
+++ b/third_party/libtiff/README.pdfium
@@ -10,3 +10,4 @@ TIFF library.
 Local Modifications:
 
 0000-build-config.patch: Local build configuration changes.
+0001-build-config.patch: Enable HAVE_SEARCH_H in tiffconf.h for VS 2015
diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
index bcc0bc5848..ca749da3ff 100644
--- a/third_party/libtiff/tiffconf.h
+++ b/third_party/libtiff/tiffconf.h
@@ -39,7 +39,11 @@
 //fx_system.h already include the string.h in ANSIC
 
 /* Define to 1 if you have the <search.h> header file. */
-/*#define HAVE_SEARCH_H 1 */
+#if _FXM_PLATFORM_ == _FXM_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
+#endif
 
 /* The size of a `int', as computed by sizeof. */
 /* According typedef int	int32_t; in the fx_system.h*/