com php-src: Fix redefine warnings: ext/imap/php_imap.h

Commit: 9507d145844928db640fb60df4783aaffea04d23 Author: Kalle Sommer Nielsen <kalle@php.net> Fri, 7 Jul 2017 08:08:25 +0200 Parents: 4be4a38d990c2e9fb4cd3e7862b2f4896b7b85fd Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9507d145844928db640fb60df4783aaffea04d23 Log: Fix redefine warnings Changed paths: M ext/imap/php_imap.h Diff: diff --git a/ext/imap/php_imap.h b/ext/imap/php_imap.h index b4b4360..c8e85de 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 */