diff options
author | Ondřej Surý <ondrej@sury.org> | 2012-11-16 13:25:37 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2012-11-16 13:25:37 +0100 |
commit | 0b82e05fe264306004119e30119e665365331e17 (patch) | |
tree | b6ee689804e9ca3946a644a80760d821a032d42f /win32 | |
parent | b57a2691d5b72c3894e2d4e0f945cecc6b3a1953 (diff) | |
download | php-0b82e05fe264306004119e30119e665365331e17.tar.gz |
Imported Upstream version 5.5.0~alpha1upstream/5.5.0_alpha1
Diffstat (limited to 'win32')
-rw-r--r-- | win32/build/config.w32 | 13 | ||||
-rw-r--r-- | win32/build/config.w32.h.in | 4 | ||||
-rw-r--r-- | win32/build/confutils.js | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | win32/globals.c | 0 | ||||
-rw-r--r-- | win32/inet.c | 6 | ||||
-rw-r--r-- | win32/inet.h | 5 | ||||
-rw-r--r-- | win32/php5dll.dsp | 8 | ||||
-rw-r--r-- | win32/php5dllts.dsp | 8 | ||||
-rw-r--r--[-rwxr-xr-x] | win32/php_win32_globals.h | 0 | ||||
-rw-r--r-- | win32/sendmail.c | 1 | ||||
-rw-r--r-- | win32/syslog.reg | 2 |
11 files changed, 22 insertions, 27 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 1a4b834be..3face08a8 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -181,8 +181,13 @@ if (VCVERS >= 1500 && PHP_MP != 'disable') { } // General link flags -DEFINE("LDFLAGS", "/nologo /version:" + - PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION); + +if (VCVERS >= 1700) { + DEFINE("LDFLAGS", "/nologo "); +} else { + DEFINE("LDFLAGS", "/nologo /version:" + + PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION); +} // General DLL link flags DEFINE("DLL_LDFLAGS", "/dll "); @@ -359,7 +364,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c \ zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \ - zend_float.c zend_string.c"); + zend_float.c zend_string.c zend_generators.c"); if (VCVERS == 1200) { AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); @@ -368,7 +373,7 @@ if (VCVERS == 1200) { ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \ php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \ - php_open_temporary_file.c php_logos.c output.c internal_functions.c php_sprintf.c"); + php_open_temporary_file.c output.c internal_functions.c php_sprintf.c"); ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c"); // Newer versions have it diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index c6cf076ba..9efdfdea3 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -6,8 +6,8 @@ /* Define the minimum supported version */ #undef _WIN32_WINNT #undef NTDDI_VERSION -#define _WIN32_WINNT 0x0501 -#define NTDDI_VERSION 0x05010200 +#define _WIN32_WINNT 0x0600 +#define NTDDI_VERSION 0x06000100 /* Default PHP / PEAR directories */ #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):"" diff --git a/win32/build/confutils.js b/win32/build/confutils.js index c0a1ce895..d9a0c1b5f 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -46,6 +46,7 @@ VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)'; VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
+VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -54,6 +55,7 @@ VC_VERSIONS_SHORT[1310] = 'VC7.1'; VC_VERSIONS_SHORT[1400] = 'VC8';
VC_VERSIONS_SHORT[1500] = 'VC9';
VC_VERSIONS_SHORT[1600] = 'VC10';
+VC_VERSIONS_SHORT[1700] = 'VC11';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";
diff --git a/win32/globals.c b/win32/globals.c index b92fad9f2..b92fad9f2 100755..100644 --- a/win32/globals.c +++ b/win32/globals.c diff --git a/win32/inet.c b/win32/inet.c index b794bcaeb..d424c8a54 100644 --- a/win32/inet.c +++ b/win32/inet.c @@ -1,11 +1,12 @@ #include "config.w32.h" -#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */ #include "php.h" #include <winsock2.h> #include <windows.h> #include <Ws2tcpip.h> #include "inet.h" +#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */ + PHPAPI int inet_pton(int af, const char* src, void* dst) { @@ -76,6 +77,8 @@ PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size) return NULL; } +#endif + int inet_aton(const char *cp, struct in_addr *inp) { inp->s_addr = inet_addr(cp); @@ -85,4 +88,3 @@ int inet_aton(const char *cp, struct in_addr *inp) { return 1; } -#endif diff --git a/win32/inet.h b/win32/inet.h index e58083828..623d114df 100644 --- a/win32/inet.h +++ b/win32/inet.h @@ -3,8 +3,9 @@ #endif #include <Ws2tcpip.h> -#if (_WIN32_WINNT < 0x0600) +#if (_WIN32_WINNT <= 0x502) PHPAPI int inet_pton(int af, const char* src, void* dst); PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size); -PHPAPI int inet_aton(const char *cp, struct in_addr *inp); #endif + +PHPAPI int inet_aton(const char *cp, struct in_addr *inp); diff --git a/win32/php5dll.dsp b/win32/php5dll.dsp index 2216d7dfe..cc56f538a 100644 --- a/win32/php5dll.dsp +++ b/win32/php5dll.dsp @@ -164,10 +164,6 @@ SOURCE=..\main\php_ini.c # End Source File
# Begin Source File
-SOURCE=..\main\php_logos.c
-# End Source File
-# Begin Source File
-
SOURCE=..\main\php_open_temporary_file.c
# End Source File
# Begin Source File
@@ -288,10 +284,6 @@ SOURCE=..\main\php_ini.h # End Source File
# Begin Source File
-SOURCE=..\main\php_logos.h
-# End Source File
-# Begin Source File
-
SOURCE=..\main\php_open_temporary_file.h
# End Source File
# Begin Source File
diff --git a/win32/php5dllts.dsp b/win32/php5dllts.dsp index a8e93ec5e..3755ea79f 100644 --- a/win32/php5dllts.dsp +++ b/win32/php5dllts.dsp @@ -201,10 +201,6 @@ SOURCE=..\main\php_ini.c # End Source File
# Begin Source File
-SOURCE=..\main\php_logos.c
-# End Source File
-# Begin Source File
-
SOURCE=..\main\php_open_temporary_file.c
# End Source File
# Begin Source File
@@ -317,10 +313,6 @@ SOURCE=..\main\php_ini.h # End Source File
# Begin Source File
-SOURCE=..\main\php_logos.h
-# End Source File
-# Begin Source File
-
SOURCE=..\main\php_main.h
# End Source File
# Begin Source File
diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 1fcfb6036..1fcfb6036 100755..100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h diff --git a/win32/sendmail.c b/win32/sendmail.c index c4969ad5e..4b09697e9 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -25,6 +25,7 @@ #ifndef NETWARE #include <winsock2.h> #include "time.h" +# include <Ws2tcpip.h> #else /* NETWARE */ #include <netware/sendmail_nw.h> #endif /* NETWARE */ diff --git a/win32/syslog.reg b/win32/syslog.reg index 4d3e27397..cb12d6e6b 100644 --- a/win32/syslog.reg +++ b/win32/syslog.reg @@ -2,4 +2,4 @@ REGEDIT4 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Eventlog\Application\PHP-5.3.99-dev]
"TypesSupported"=dword:00000007
-"EventMessageFile"="g:\\test\\srcinstall6\\php5ts_debug.dll"
+"EventMessageFile"="g:\\test\\srctrunkinstall\\php5ts.dll"
|