Andi
At 03:01 PM 12/22/2003 +0000, Wez Furlong wrote:
wez Mon Dec 22 10:01:06 2003 EDT
Added files: /TSRM config.w32
Modified files: /TSRM tsrm_win32.c tsrm_win32.h /php-src/win32/build buildconf.js config.w32 Log: Fix bug #26692; Could not find GetLongPathNameA under NT4. This fix relies on you having the Platform SDK headers. Using the new build system, the NewAPIs.h header will be detected automatically, however, for people building using .dsp files, you will need to add /DHAVE_NEWAPIS_H=1 to the TSRM project if you have those newer headers.
Index: TSRM/tsrm_win32.c diff -u TSRM/tsrm_win32.c:1.23 TSRM/tsrm_win32.c:1.24 --- TSRM/tsrm_win32.c:1.23 Mon Dec 1 15:18:55 2003 +++ TSRM/tsrm_win32.c Mon Dec 22 10:01:05 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: tsrm_win32.c,v 1.23 2003/12/01 20:18:55 andi Exp $ */ +/* $Id: tsrm_win32.c,v 1.24 2003/12/22 15:01:05 wez Exp $ */
#include <stdio.h> #include <fcntl.h> @@ -29,6 +29,11 @@ #include "TSRM.h"
#ifdef TSRM_WIN32 + +#if HAVE_NEWAPIS_H +# define COMPILE_NEWAPIS_STUBS +#endif + #include "tsrm_win32.h"
#ifdef ZTS Index: TSRM/tsrm_win32.h diff -u TSRM/tsrm_win32.h:1.15 TSRM/tsrm_win32.h:1.16 --- TSRM/tsrm_win32.h:1.15 Tue Sep 30 05:48:53 2003 +++ TSRM/tsrm_win32.h Mon Dec 22 10:01:05 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */
-/* $Id: tsrm_win32.h,v 1.15 2003/09/30 09:48:53 stas Exp $ */ +/* $Id: tsrm_win32.h,v 1.16 2003/12/22 15:01:05 wez Exp $ */
#ifndef TSRM_WIN32_H #define TSRM_WIN32_H @@ -24,6 +24,11 @@ #include "TSRM.h" #include <windows.h>
+#if HAVE_NEWAPIS_H
+# define WANT_GETLONGPATHNAME_WRAPPER
+# include <NewAPIs.h>
+#endif
+
struct ipc_perm {
int key;
unsigned short uid;
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.6 php-src/win32/build/buildconf.js:1.7
--- php-src/win32/build/buildconf.js:1.6 Fri Dec 19 07:50:11 2003
+++ php-src/win32/build/buildconf.js Mon Dec 22 10:01:05 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: buildconf.js,v 1.6 2003/12/19 12:50:11 wez Exp $ */ +/* $Id: buildconf.js,v 1.7 2003/12/22 15:01:05 wez Exp $ */ // This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js"); @@ -90,6 +90,8 @@
// Pull in code from sapi and extensions
modules = file_get_contents("win32/build/config.w32");
+// Pick up confs from TSRM and Zend if present
+find_config_w32(".");
find_config_w32("sapi");
find_config_w32("ext");
find_config_w32("pecl");
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.17 php-src/win32/build/config.w32:1.18
--- php-src/win32/build/config.w32:1.17 Mon Dec 22 08:13:39 2003
+++ php-src/win32/build/config.w32 Mon Dec 22 10:01:05 2003
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.17 2003/12/22 13:13:39 wez Exp $
+// $Id: config.w32,v 1.18 2003/12/22 15:01:05 wez Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -166,7 +166,6 @@
STDOUT.WriteLine("Build dir: " + get_define('BUILD_DIR'));
STDOUT.WriteLine("PHP Core: " + get_define('PHPDLL') + " and " + get_define('PHPLIB'));
-ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
zend_ini_parser.c zend_ini_scanner.c zend_alloc.c zend_compile.c \
zend_constants.c zend_dynamic_array.c zend_execute_API.c zend_highlight.c \
Index: TSRM/config.w32 +++ TSRM/config.w32 // vim:ft=javascript // $Id: config.w32,v 1.1 2003/12/22 15:01:05 wez Exp $
if (CHECK_HEADER_ADD_INCLUDE("NewAPIs.h", "CFLAGS_PHP", php_usual_include_suspects)) {
// Need to add the flag directly, since TSRM doesn't include the config
// header
ADD_FLAG("CFLAGS_PHP", "/DHAVE_NEWAPIS_H=1");
}
ADD_SOURCES("TSRM", "TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c tsrm_win32.c");
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
