You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
Ryan Schmidt
23 lines
733 B
Diff
23 lines
733 B
Diff
Fix build with unpatched jpeg 9
|
|
|
|
zend.h from PHP 5.2 and earlier uses #include <mach-o/dyld.h> which
|
|
provides definitions of TRUE and FALSE that conflict with the ones
|
|
jpeg 9 will define. So tell jpeg we've already defined them, and what
|
|
their type is.
|
|
|
|
PHP 5.3 and later aren't affected because they no longer #include
|
|
<mach-o/dyld.h>; see <https://bugs.php.net/bug.php?id=42630>.
|
|
--- ext/gd/libgd/gd_jpeg.c.orig 2006-02-05 09:53:58.000000000 -0600
|
|
+++ ext/gd/libgd/gd_jpeg.c 2017-10-16 20:11:17.000000000 -0500
|
|
@@ -35,6 +35,10 @@
|
|
#undef HAVE_STDLIB_H
|
|
|
|
/* 1.8.1: remove dependency on jinclude.h */
|
|
+#ifdef ENUM_DYLD_BOOL
|
|
+#define HAVE_BOOLEAN
|
|
+typedef enum DYLD_BOOL boolean;
|
|
+#endif
|
|
#include "jpeglib.h"
|
|
#include "jerror.h"
|
|
|