diff options
| author | Wez Furlong <wez@php.net> | 2005-12-14 02:01:13 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2005-12-14 02:01:13 +0000 |
| commit | b041abbb4e3d4772f84c61dea019a3bf2744ddbc (patch) | |
| tree | 324f7ce188174b6e3f2e7722bcfa6efbd9a96e9a | |
| parent | 1b7e3fe2a5416b60cc093458dd0bfcfd580c52f1 (diff) | |
| download | php-git-b041abbb4e3d4772f84c61dea019a3bf2744ddbc.tar.gz | |
Fixes for building with vs.net 2005.
| -rw-r--r-- | main/win95nt.h | 4 | ||||
| -rw-r--r-- | win32/build/config.w32 | 5 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/main/win95nt.h b/main/win95nt.h index ff24f8e5f0..d481edd395 100644 --- a/main/win95nt.h +++ b/main/win95nt.h @@ -46,7 +46,9 @@ typedef char * caddr_t; #define rmdir(a) _rmdir(a) #define getpid _getpid #define php_sleep(t) Sleep(t*1000) -#define getcwd(a, b) _getcwd(a, b) +#ifndef getcwd +# define getcwd(a, b) _getcwd(a, b) +#endif #define off_t _off_t typedef unsigned int uint; typedef unsigned long ulong; diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 7cdb79ad9f..031f1e2abe 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -97,8 +97,9 @@ if (VCVERS < 14) { if (VCVERS >= 14) { // fun stuff: MS deprecated ANSI stdio and similar functions - // disable annoying warnings - ADD_FLAG('CFLAGS', ' /wd4996 '); + // disable annoying warnings. In addition, time_t defaults + // to 64-bit. Ask for 32-bit. + ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 '); if (PHP_DEBUG == "yes") { // Set some debug/release specific options diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index b6994c6113..efcc1ba40a 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -142,3 +142,10 @@ #undef HAVE_ATOF_ACCEPTS_NAN #undef HAVE_ATOF_ACCEPTS_INF #define HAVE_HUGE_VAL_NAN 1 + +/* vs.net 2005 has a 64-bit time_t. This will likely break + * 3rdParty libs that were built with older compilers; switch + * back to 32-bit */ +#define _USE_32BIT_TIME_T 1 +#define HAVE_STDLIB_H 1 + |