diff options
author | Kalle Sommer Nielsen <kalle@php.net> | 2009-12-03 11:50:32 +0000 |
---|---|---|
committer | Kalle Sommer Nielsen <kalle@php.net> | 2009-12-03 11:50:32 +0000 |
commit | 1063c8346bd319ac3ca5fd6531442ff8fc8ec66c (patch) | |
tree | fe19b76eef0ab990cc880474a8bf6e6ee3e58e3d /win32 | |
parent | 0f0f5f229b18e27d07e820cc3863d5dc9ea95fd0 (diff) | |
download | php-git-1063c8346bd319ac3ca5fd6531442ff8fc8ec66c.tar.gz |
MFT: VC10 build support
Diffstat (limited to 'win32')
-rw-r--r-- | win32/build/config.w32 | 2 | ||||
-rw-r--r-- | win32/php_stdint.h | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 8861d49b78..c52ce01737 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -148,7 +148,7 @@ if (VCVERS >= 1400) { } } -ARG_WITH('mp', 'Tell VC9 use up to [n,auto,disable] processes for compilation', 'auto'); +ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for compilation', 'auto'); if (VCVERS >= 1500 && PHP_MP != 'disable') { // no from disable-all if(PHP_MP == 'auto' || PHP_MP == 'no') { diff --git a/win32/php_stdint.h b/win32/php_stdint.h index 6eb8ce48f0..5df1df4777 100644 --- a/win32/php_stdint.h +++ b/win32/php_stdint.h @@ -238,7 +238,12 @@ typedef uint64_t uintmax_t; #define INTMAX_C INT64_C #define UINTMAX_C UINT64_C -static __inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; } +#if _MSC_VER < 1600 +static __inline int64_t llabs(int64_t i) +{ + return i >= 0 ? i: -i; +} +#endif #endif // __STDC_CONSTANT_MACROS ] |