diff options
| author | Anatol Belski <ab@php.net> | 2014-03-24 10:30:05 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-03-24 10:30:05 +0100 |
| commit | 13e8486550542b97e6747a9900c40633f4220719 (patch) | |
| tree | 401e7596b20db2892847dc5bfc0805ffd3393881 /sapi | |
| parent | 9d4001f1c8502d0217417c859b59b771e38ed487 (diff) | |
| parent | 8558640a6a795f12313119f47442a2bf68f434e1 (diff) | |
| download | php-git-13e8486550542b97e6747a9900c40633f4220719.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
updated NEWS
updated NEWS
Fixed bug #65715 php5embed.lib isn't provided anymore
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/embed/config.w32 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/embed/config.w32 b/sapi/embed/config.w32 index f3cc60d600..64e44bdd94 100644 --- a/sapi/embed/config.w32 +++ b/sapi/embed/config.w32 @@ -3,6 +3,8 @@ ARG_ENABLE('embed', 'Embedded SAPI library', 'no'); +var PHP_EMBED_PGO = false; + if (PHP_EMBED != "no") { SAPI('embed', 'php_embed.c', 'php' + PHP_VERSION + 'embed.lib'); PHP_INSTALL_HEADERS("sapi/embed", "php_embed.h"); |