diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-09-27 11:27:58 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-09-27 11:27:58 +0200 |
| commit | 1fd24dd3e14010b82febd3e300599f8d8f9c592c (patch) | |
| tree | 60d089e947831184a569c1db6c23e45e18d46723 /win32 | |
| parent | 9989e8bb3d7b37e3b3b351feece5ed4346174ccf (diff) | |
| download | php-1fd24dd3e14010b82febd3e300599f8d8f9c592c.tar.gz | |
New upstream version 5.5.4+dfsgupstream/5.5.4+dfsg
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32 | 2 | ||||
| -rw-r--r-- | win32/build/config.w32.phpize.in | 2 | ||||
| -rw-r--r-- | win32/build/libs_version.txt | 10 |
3 files changed, 3 insertions, 11 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 3face08a8..3401205c8 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -155,7 +155,7 @@ if (VCVERS >= 1400) { // disable annoying warnings. In addition, time_t defaults // to 64-bit. Ask for 32-bit. if (X64) { - ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 '); + ADD_FLAG('CFLAGS', ' /wd4996 '); } else { ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 '); } diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in index b8bf45ea5..7b3b40633 100644 --- a/win32/build/config.w32.phpize.in +++ b/win32/build/config.w32.phpize.in @@ -134,7 +134,7 @@ if (VCVERS >= 1400) { // disable annoying warnings. In addition, time_t defaults
// to 64-bit. Ask for 32-bit.
if (X64) {
- ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 ');
+ ADD_FLAG('CFLAGS', ' /wd4996 ');
} else {
ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 ');
}
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt index 096d723a9..123a75d78 100644 --- a/win32/build/libs_version.txt +++ b/win32/build/libs_version.txt @@ -1,25 +1,17 @@ bz2-1.0.6 -cclient-2007e cclient-2007f freetype-2.4.10 -icu-49.1.2 icu-50.1.2 -jpeglib-8 jpeglib-9 libcurl-7.30.0 libiconv-1.14 libmcrypt-2.5.8 libmpir-2.5.1 libmpir-2.6.0 -libpng-1.2.50 -libpng-1.5.13 -libpq-8.3.6 +libpng-1.5.14 libpq-9.2.2 libssh2-1.4.2 -libtidy-20090325 libtidy-20090406 libxslt-1.1.27 -libxml-2.7.8 libxml-2.9.1 -openssl-0.9.8y openssl-1.0.1e |