com php-src: integrate /Zc:inline switch: win32/build/confutils.js
| From: | Anatol Belski | Date: | Mon, 18 Jan 2016 17:32:15 +0000 |
| Subject: | com php-src: integrate /Zc:inline switch: win32/build/confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90690@lists.php.net to get a copy of this message | ||
Commit: b94ed769f410b319a6b2ed50cc6377e48e6467cd
Author: Anatol Belski <ab@php.net> Mon, 18 Jan 2016 18:05:34 +0100
Parents: 9ceb53b071fff8bc43bb2fad9de286c16f9e5ea9
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b94ed769f410b319a6b2ed50cc6377e48e6467cd
Log:
integrate /Zc:inline switch
Changed paths:
M win32/build/confutils.js
Diff:
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index c2852cf..a9b2e9c 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2644,6 +2644,9 @@ function toolset_setup_common_cflags()
} else {
if (VCVERS >= 1900) {
ADD_FLAG('CFLAGS', "/guard:cf");
+ if (PHP_PGI != "yes" && PHP_PGO != "yes") {
+ ADD_FLAG('CFLAGS', "/Zc:inline");
+ }
}
}