com php-src: Ignore notices with headers already being defined to their magic HAVE_<name>_H define on Windows.: win 32/build/confutils.js
| From: | Kalle Sommer Nielsen | Date: | Wed, 19 Oct 2016 04:29:15 +0000 |
| Subject: | com php-src: Ignore notices with headers already being defined to their magic HAVE_<name>_H define on Windows.: win 32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-95216@lists.php.net to get a copy of this message | ||
Commit: 59090b6499d143394355c08c59cba6b1ef9bdf42
Author: Kalle Sommer Nielsen <kalle@php.net> Wed, 19 Oct 2016 06:29:15 +0200
Parents: 0ffd0a0217e8edefbb400f4dbab89009e41821b1
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=59090b6499d143394355c08c59cba6b1ef9bdf42
Log:
Ignore notices with headers already being defined to their magic HAVE_<name>_H define on
Windows.
This is very minor and only happens so far for zlib.h, which both ext/zip and ext/zlib looks for.
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 1e6ba36..7ccda7e 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -945,7 +945,7 @@ function CHECK_HEADER_ADD_INCLUDE(header_name, flag_name, path_to_check, use_env
if (typeof(add_to_flag_only) != "undefined") {
ADD_FLAG(flag_name, "/DHAVE_" + sym + "=" + have);
- } else {
+ } else if (!configure_hdr.Exists('HAVE_' + sym)) {
AC_DEFINE("HAVE_" + sym, have, "have the " + header_name + " header
file");
}