Fix redefine warnings

diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h
index b4b4360860ee9085a03ba6031f8756eb250f623c..c8e85de19b81e3536b954dda0d93e0925143ce6d 100644 (file)
--- a/ext/imap/php_imap.h
+++ b/ext/imap/php_imap.h
@@ -35,6 +35,21 @@
 #if HAVE_IMAP
 
 #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
+
+ /* For now these appear on Windows, remove this check if it appears outside */
+# ifdef PHP_WIN32
+ /* Undefine these LOG defines to avoid warnings */
+#  undef LOG_EMERG
+#  undef LOG_CRIT
+#  undef LOG_ERR
+#  undef LOG_WARNING
+#  undef LOG_NOTICE
+#  undef LOG_DEBUG
+
+ /* c-client also redefines its own ftruncate */
+#  undef ftruncate
+# endif
+
  /* these are used for quota support */
 # include "c-client.h" /* includes mail.h and rfc822.h */
 # include "imap4r1.h"  /* location of c-client quota functions */