This patch allows cpdf to be compiled in conjunction with ncurses, which was

not possible before due to conflicting defines.

diff --git a/ext/cpdf/cpdf.c b/ext/cpdf/cpdf.c
index 4bb9847d399be2d734d336e1639b7b02f12401ba..99edcacdaa8278d2e16cd6e0d5065776d505847a 100644 (file)
--- a/ext/cpdf/cpdf.c
+++ b/ext/cpdf/cpdf.c
@@ -45,6 +45,8 @@
 # endif
 #endif
 
+#include <cpdflib.h>
+
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif

diff --git a/ext/cpdf/php_cpdf.h b/ext/cpdf/php_cpdf.h
index 45dda34f7d0a4d1098755697f5a539ff5909ddb0..1207511e60a40095b328c72d171fd21b08b1bfdd 100644 (file)
--- a/ext/cpdf/php_cpdf.h
+++ b/ext/cpdf/php_cpdf.h
@@ -29,8 +29,6 @@
 #undef T
 #endif
 
-#include <cpdflib.h>
-
 extern zend_module_entry cpdf_module_entry;
 #define cpdf_module_ptr &cpdf_module_entry