summaryrefslogtreecommitdiff
path: root/third_party
diff options
context:
space:
mode:
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libtiff/0000-build-config.patch6
-rw-r--r--third_party/libtiff/tiffconf.h4
2 files changed, 3 insertions, 7 deletions
diff --git a/third_party/libtiff/0000-build-config.patch b/third_party/libtiff/0000-build-config.patch
index c59249c11b..64e86e60ad 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,250 @@
+@@ -0,0 +1,248 @@
+/* libtiff/tiffconf.h. Generated by configure. */
+/*
+ Configuration defines for installed libtiff.
@@ -102,9 +102,7 @@ diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
+#ifndef _TIFFCONF_
+#define _TIFFCONF_
+
-+#ifndef _FX_SYSTEM_H_
-+# include "../../core/include/fxcrt/fx_system.h"
-+#endif
++#include "core/include/fxcrt/fx_system.h"
+
+//NOTE: The tiff codec requires an ANSI C compiler environment for building and
+// presumes an ANSI C environment for use.
diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h
index e36bde6571..bcc0bc5848 100644
--- a/third_party/libtiff/tiffconf.h
+++ b/third_party/libtiff/tiffconf.h
@@ -7,9 +7,7 @@
#ifndef _TIFFCONF_
#define _TIFFCONF_
-#ifndef _FX_SYSTEM_H_
-# include "../../core/include/fxcrt/fx_system.h"
-#endif
+#include "core/include/fxcrt/fx_system.h"
//NOTE: The tiff codec requires an ANSI C compiler environment for building and
// presumes an ANSI C environment for use.