From: Kalle Sommer Nielsen <kalle@php.net>
Date: Fri, 7 Jul 2017 06:08:25 +0000 (+0200)
Subject: Fix redefine warnings
X-Git-Tag: php-7.2.0beta1~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9507d145844928db640fb60df4783aaffea04d23;p=php

Fix redefine warnings
---

diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h
index b4b4360860..c8e85de19b 100644
--- 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 */