mirror of
https://github.com/php/php-src.git
synced 2024-09-24 11:27:28 +00:00
Merge branch 'PHP-5.5'
* PHP-5.5: removed the /Wp64 switch as we use true 64 bit compiler now
This commit is contained in:
commit
82bb2a2535
@ -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 ');
|
||||
}
|
||||
|
@ -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 ');
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user