zeev Mon Feb 17 08:29:59 2003 EDT
Modified files:
/php4/main fopen_wrappers.c main.c network.c php.h
php_open_temporary_file.c
/php4/ext/rpc/com com.c conversion.c dispatch.c variant.c
/php4/ext/snmp winsnmp.c
/php4/ext/standard file.c flock_compat.c ftp_fopen_wrapper.c
http_fopen_wrapper.c pack.c rand.c
/php4/ext/w32api w32api.c
/php4/ext/zlib zlib.c
/php4/sapi/apache php_apache_http.h
/php4/sapi/cgi cgi_main.c
/php4/sapi/isapi php4isapi.c
Log:
Win32 build improvements
Index: php4/main/fopen_wrappers.c
diff -u php4/main/fopen_wrappers.c:1.156 php4/main/fopen_wrappers.c:1.157
--- php4/main/fopen_wrappers.c:1.156 Sat Feb 15 22:48:48 2003
+++ php4/main/fopen_wrappers.c Mon Feb 17 08:29:56 2003
@@ -16,7 +16,7 @@
| Jim Winstead <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: fopen_wrappers.c,v 1.156 2003/02/16 03:48:48 wez Exp $ */
+/* $Id: fopen_wrappers.c,v 1.157 2003/02/17 13:29:56 zeev Exp $ */
/* {{{ includes
*/
@@ -32,8 +32,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
Index: php4/main/main.c
diff -u php4/main/main.c:1.525 php4/main/main.c:1.526
--- php4/main/main.c:1.525 Sat Feb 15 15:22:19 2003
+++ php4/main/main.c Mon Feb 17 08:29:56 2003
@@ -18,10 +18,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.525 2003/02/15 20:22:19 sniper Exp $ */
+/* $Id: main.c,v 1.526 2003/02/17 13:29:56 zeev Exp $ */
/* {{{ includes
*/
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include <stdio.h>
#include "php.h"
#ifdef PHP_WIN32
Index: php4/main/network.c
diff -u php4/main/network.c:1.87 php4/main/network.c:1.88
--- php4/main/network.c:1.87 Sat Feb 15 22:48:48 2003
+++ php4/main/network.c Mon Feb 17 08:29:56 2003
@@ -16,7 +16,7 @@
| Streams work by Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.87 2003/02/16 03:48:48 wez Exp $ */
+/* $Id: network.c,v 1.88 2003/02/17 13:29:56 zeev Exp $ */
/*#define DEBUG_MAIN_NETWORK 1*/
@@ -25,8 +25,6 @@
#include <stddef.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
Index: php4/main/php.h
diff -u php4/main/php.h:1.181 php4/main/php.h:1.182
--- php4/main/php.h:1.181 Sat Feb 15 22:48:48 2003
+++ php4/main/php.h Mon Feb 17 08:29:56 2003
@@ -17,14 +17,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.181 2003/02/16 03:48:48 wez Exp $ */
+/* $Id: php.h,v 1.182 2003/02/17 13:29:56 zeev Exp $ */
#ifndef PHP_H
#define PHP_H
-
-#ifdef PHP_WIN32
-#include <winsock2.h>
-#endif
#ifdef HAVE_DMALLOC
#include <dmalloc.h>
Index: php4/main/php_open_temporary_file.c
diff -u php4/main/php_open_temporary_file.c:1.23
php4/main/php_open_temporary_file.c:1.24
--- php4/main/php_open_temporary_file.c:1.23 Sat Feb 15 22:48:48 2003
+++ php4/main/php_open_temporary_file.c Mon Feb 17 08:29:56 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_open_temporary_file.c,v 1.23 2003/02/16 03:48:48 wez Exp $ */
+/* $Id: php_open_temporary_file.c,v 1.24 2003/02/17 13:29:56 zeev Exp $ */
#include "php.h"
@@ -26,8 +26,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#include "win32/winutil.h"
Index: php4/ext/rpc/com/com.c
diff -u php4/ext/rpc/com/com.c:1.21 php4/ext/rpc/com/com.c:1.22
--- php4/ext/rpc/com/com.c:1.21 Mon Feb 10 19:54:25 2003
+++ php4/ext/rpc/com/com.c Mon Feb 17 08:29:57 2003
@@ -19,6 +19,8 @@
#define _WIN32_DCOM
#define COBJMACROS
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include "../rpc.h"
#include "../handler.h"
Index: php4/ext/rpc/com/conversion.c
diff -u php4/ext/rpc/com/conversion.c:1.55 php4/ext/rpc/com/conversion.c:1.56
--- php4/ext/rpc/com/conversion.c:1.55 Mon Feb 10 15:58:53 2003
+++ php4/ext/rpc/com/conversion.c Mon Feb 17 08:29:57 2003
@@ -31,6 +31,8 @@
#ifdef PHP_WIN32
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include "php.h"
#include "../rpc.h"
Index: php4/ext/rpc/com/dispatch.c
diff -u php4/ext/rpc/com/dispatch.c:1.5 php4/ext/rpc/com/dispatch.c:1.6
--- php4/ext/rpc/com/dispatch.c:1.5 Tue Dec 31 11:07:23 2002
+++ php4/ext/rpc/com/dispatch.c Mon Feb 17 08:29:57 2003
@@ -16,12 +16,14 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dispatch.c,v 1.5 2002/12/31 16:07:23 sebastian Exp $ */
+/* $Id: dispatch.c,v 1.6 2003/02/17 13:29:57 zeev Exp $ */
/*
* This module is used to export PHP objects to COM and DOTNET by exposing
* them as objects implementing IDispatch.
* */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
#include "../rpc.h"
Index: php4/ext/rpc/com/variant.c
diff -u php4/ext/rpc/com/variant.c:1.39 php4/ext/rpc/com/variant.c:1.40
--- php4/ext/rpc/com/variant.c:1.39 Thu Feb 13 12:39:17 2003
+++ php4/ext/rpc/com/variant.c Mon Feb 17 08:29:57 2003
@@ -27,6 +27,8 @@
#ifdef PHP_WIN32
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
#include "php.h"
#include "php_ini.h"
#include "ext/standard/info.h"
Index: php4/ext/snmp/winsnmp.c
diff -u php4/ext/snmp/winsnmp.c:1.15 php4/ext/snmp/winsnmp.c:1.16
--- php4/ext/snmp/winsnmp.c:1.15 Sat Jan 18 19:45:49 2003
+++ php4/ext/snmp/winsnmp.c Mon Feb 17 08:29:57 2003
@@ -10,8 +10,6 @@
#include "php_snmp.h"
#include <sys/types.h>
-#include <windows.h>
-
#include <stdio.h>
#include <string.h>
#include <malloc.h>
Index: php4/ext/standard/file.c
diff -u php4/ext/standard/file.c:1.303 php4/ext/standard/file.c:1.304
--- php4/ext/standard/file.c:1.303 Sun Feb 16 17:33:29 2003
+++ php4/ext/standard/file.c Mon Feb 17 08:29:57 2003
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.303 2003/02/16 22:33:29 wez Exp $ */
+/* $Id: file.c,v 1.304 2003/02/17 13:29:57 zeev Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -43,8 +43,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#include "win32/winutil.h"
Index: php4/ext/standard/flock_compat.c
diff -u php4/ext/standard/flock_compat.c:1.24 php4/ext/standard/flock_compat.c:1.25
--- php4/ext/standard/flock_compat.c:1.24 Sun Feb 16 22:07:32 2003
+++ php4/ext/standard/flock_compat.c Mon Feb 17 08:29:57 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: flock_compat.c,v 1.24 2003/02/17 03:07:32 sniper Exp $ */
+/* $Id: flock_compat.c,v 1.25 2003/02/17 13:29:57 zeev Exp $ */
#include "php.h"
#include <errno.h>
@@ -29,7 +29,6 @@
#endif
#ifdef PHP_WIN32
-#include <windows.h>
#include <io.h>
#endif
Index: php4/ext/standard/ftp_fopen_wrapper.c
diff -u php4/ext/standard/ftp_fopen_wrapper.c:1.43
php4/ext/standard/ftp_fopen_wrapper.c:1.44
--- php4/ext/standard/ftp_fopen_wrapper.c:1.43 Sat Feb 15 22:48:47 2003
+++ php4/ext/standard/ftp_fopen_wrapper.c Mon Feb 17 08:29:57 2003
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: ftp_fopen_wrapper.c,v 1.43 2003/02/16 03:48:47 wez Exp $ */
+/* $Id: ftp_fopen_wrapper.c,v 1.44 2003/02/17 13:29:57 zeev Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -31,7 +31,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
Index: php4/ext/standard/http_fopen_wrapper.c
diff -u php4/ext/standard/http_fopen_wrapper.c:1.62
php4/ext/standard/http_fopen_wrapper.c:1.63
--- php4/ext/standard/http_fopen_wrapper.c:1.62 Sat Feb 15 22:48:47 2003
+++ php4/ext/standard/http_fopen_wrapper.c Mon Feb 17 08:29:57 2003
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: http_fopen_wrapper.c,v 1.62 2003/02/16 03:48:47 wez Exp $ */
+/* $Id: http_fopen_wrapper.c,v 1.63 2003/02/17 13:29:57 zeev Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -35,8 +35,6 @@
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
Index: php4/ext/standard/pack.c
diff -u php4/ext/standard/pack.c:1.46 php4/ext/standard/pack.c:1.47
--- php4/ext/standard/pack.c:1.46 Sat Feb 15 22:48:47 2003
+++ php4/ext/standard/pack.c Mon Feb 17 08:29:57 2003
@@ -15,7 +15,7 @@
| Author: Chris Schneider <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: pack.c,v 1.46 2003/02/16 03:48:47 wez Exp $ */
+/* $Id: pack.c,v 1.47 2003/02/17 13:29:57 zeev Exp $ */
#include "php.h"
@@ -26,8 +26,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#elif defined(NETWARE)
Index: php4/ext/standard/rand.c
diff -u php4/ext/standard/rand.c:1.61 php4/ext/standard/rand.c:1.62
--- php4/ext/standard/rand.c:1.61 Tue Dec 31 11:07:54 2002
+++ php4/ext/standard/rand.c Mon Feb 17 08:29:58 2003
@@ -20,16 +20,9 @@
| Based on code from: Shawn Cokus <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: rand.c,v 1.61 2002/12/31 16:07:54 sebastian Exp $ */
+/* $Id: rand.c,v 1.62 2003/02/17 13:29:58 zeev Exp $ */
#include <stdlib.h>
-
-#ifdef PHP_WIN32
-# ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-# endif
-# include <windows.h>
-#endif
#if defined(NETWARE) && !defined(NEW_LIBC) /* For getpid() used below */
#include "netware/pwd.h"
Index: php4/ext/w32api/w32api.c
diff -u php4/ext/w32api/w32api.c:1.8 php4/ext/w32api/w32api.c:1.9
--- php4/ext/w32api/w32api.c:1.8 Sun Jan 19 03:32:23 2003
+++ php4/ext/w32api/w32api.c Mon Feb 17 08:29:58 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: w32api.c,v 1.8 2003/01/19 08:32:23 iliaa Exp $ */
+/* $Id: w32api.c,v 1.9 2003/02/17 13:29:58 zeev Exp $ */
/*
* Win32 API Extension for PHP 4
@@ -208,9 +208,6 @@
#include <stdio.h>
#include <stdlib.h>
-
-#define WINDOWS_LEAN_AND_MEAN
-#include <windows.h>
#include "php.h"
#include "php_ini.h"
Index: php4/ext/zlib/zlib.c
diff -u php4/ext/zlib/zlib.c:1.162 php4/ext/zlib/zlib.c:1.163
--- php4/ext/zlib/zlib.c:1.162 Sat Feb 15 22:48:47 2003
+++ php4/ext/zlib/zlib.c Mon Feb 17 08:29:58 2003
@@ -18,7 +18,7 @@
| Jade Nicoletti <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: zlib.c,v 1.162 2003/02/16 03:48:47 wez Exp $ */
+/* $Id: zlib.c,v 1.163 2003/02/17 13:29:58 zeev Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -35,8 +35,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#ifdef PHP_WIN32
-#include <windows.h>
-#include <winsock2.h>
#define O_RDONLY _O_RDONLY
#include "win32/param.h"
#else
Index: php4/sapi/apache/php_apache_http.h
diff -u php4/sapi/apache/php_apache_http.h:1.4 php4/sapi/apache/php_apache_http.h:1.5
--- php4/sapi/apache/php_apache_http.h:1.4 Mon Oct 7 20:13:56 2002
+++ php4/sapi/apache/php_apache_http.h Mon Feb 17 08:29:58 2003
@@ -1,7 +1,6 @@
#define NO_REGEX_EXTRA_H
#ifdef WIN32
-#include <winsock2.h>
#include <stddef.h>
#endif
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.213 php4/sapi/cgi/cgi_main.c:1.214
--- php4/sapi/cgi/cgi_main.c:1.213 Sun Feb 16 22:39:58 2003
+++ php4/sapi/cgi/cgi_main.c Mon Feb 17 08:29:59 2003
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.213 2003/02/17 03:39:58 shane Exp $ */
+/* $Id: cgi_main.c,v 1.214 2003/02/17 13:29:59 zeev Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1572,7 +1572,7 @@
sapi_shutdown();
#ifdef ZTS
- tsrm_shutdown();
+ /*tsrm_shutdown();*/
#endif
#if PHP_WIN32 && ZEND_DEBUG && 0
Index: php4/sapi/isapi/php4isapi.c
diff -u php4/sapi/isapi/php4isapi.c:1.97 php4/sapi/isapi/php4isapi.c:1.98
--- php4/sapi/isapi/php4isapi.c:1.97 Mon Feb 17 08:11:22 2003
+++ php4/sapi/isapi/php4isapi.c Mon Feb 17 08:29:59 2003
@@ -17,26 +17,25 @@
+----------------------------------------------------------------------+
*/
-#ifdef PHP_WIN32
-# include <winsock2.h>
-# include <windows.h>
-# include <process.h>
-#else
-# define __try
-# define __except(val)
-# define __declspec(foo)
-#endif
-
+#include "php.h"
#include <httpext.h>
#include <httpfilt.h>
#include <httpext.h>
-#include "php.h"
#include "php_main.h"
#include "SAPI.h"
#include "php_globals.h"
#include "ext/standard/info.h"
#include "php_variables.h"
#include "php_ini.h"
+
+#ifdef PHP_WIN32
+# include <process.h>
+#else
+# define __try
+# define __except(val)
+# define __declspec(foo)
+#endif
+
#ifdef WITH_ZEUS
# include "httpext.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
