sas Thu Oct 24 09:14:51 2002 EDT
Modified files:
/php4 configure.in
/php4/ext/dbase dbase.c
/php4/ext/dotnet php_dotnet.h
/php4/ext/fbsql php_fbsql.c
/php4/ext/filepro filepro.c
/php4/ext/gd gdcache.c
/php4/ext/hwapi hwapi.cpp
/php4/ext/hyperwave hw.c
/php4/ext/imap php_imap.h
/php4/ext/informix ifx.ec
/php4/ext/mcal php_mcal.h
/php4/ext/mysql php_mysql.c
/php4/ext/oci8 oci8.c
/php4/ext/odbc php_odbc.c
/php4/ext/oracle oracle.c
/php4/ext/standard dl.c fsock.c info.c mail.c
/php4/ext/xml xml.c
/php4/main main.c php.h php_ini.c streams.c
/php4/regex regex_extra.h
/php4/sapi/apache php_apache.c
/php4/sapi/cgi cgi_main.c
/php4/sapi/cli php_cli.c
/php4/sapi/servlet servlet.c
Log:
centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
Index: php4/configure.in
diff -u php4/configure.in:1.387 php4/configure.in:1.388
--- php4/configure.in:1.387 Thu Oct 24 08:21:06 2002
+++ php4/configure.in Thu Oct 24 09:14:32 2002
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.387 2002/10/24 12:21:06 sas Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.388 2002/10/24 13:14:32 sas Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -325,6 +325,7 @@
locale.h \
monetary.h \
mach-o/dyld.h \
+netdb.h \
pwd.h \
resolv.h \
signal.h \
@@ -1107,6 +1108,8 @@
PHP_GEN_BUILD_DIRS
PHP_GEN_GLOBAL_MAKEFILE
+
+AC_DEFINE([HAVE_BUILD_DEFS_H], 1, [ ])
$php_shtool mkdir -p pear/scripts
ALL_OUTPUT_FILES="php4.spec main/build-defs.h \
Index: php4/ext/dbase/dbase.c
diff -u php4/ext/dbase/dbase.c:1.59 php4/ext/dbase/dbase.c:1.60
--- php4/ext/dbase/dbase.c:1.59 Sun Jun 16 22:27:34 2002
+++ php4/ext/dbase/dbase.c Thu Oct 24 09:14:33 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dbase.c,v 1.59 2002/06/17 02:27:34 sniper Exp $ */
+/* $Id: dbase.c,v 1.60 2002/10/24 13:14:33 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -760,7 +760,7 @@
#ifdef COMPILE_DL_DBASE
ZEND_GET_MODULE(dbase)
-#if (WIN32|WINNT) && defined(THREAD_SAFE)
+#if defined(PHP_WIN32) && defined(THREAD_SAFE)
/*NOTE: You should have an odbc.def file where you
export DllMain*/
Index: php4/ext/dotnet/php_dotnet.h
diff -u php4/ext/dotnet/php_dotnet.h:1.2 php4/ext/dotnet/php_dotnet.h:1.3
--- php4/ext/dotnet/php_dotnet.h:1.2 Sun Jul 29 21:56:24 2001
+++ php4/ext/dotnet/php_dotnet.h Thu Oct 24 09:14:33 2002
@@ -1,7 +1,7 @@
#ifndef PHP_DOTNET_H
#define PHP_DOTNET_H
-#if WIN32|WINNT
+#ifdef PHP_WIN32
PHP_MINIT_FUNCTION(DOTNET);
PHP_MSHUTDOWN_FUNCTION(DOTNET);
@@ -14,7 +14,7 @@
#define DOTNET_module_ptr NULL
-#endif /* Win32|WINNT */
+#endif /* PHP_WIN32 */
#define phpext_DOTNET_ptr DOTNET_module_ptr
Index: php4/ext/fbsql/php_fbsql.c
diff -u php4/ext/fbsql/php_fbsql.c:1.85 php4/ext/fbsql/php_fbsql.c:1.86
--- php4/ext/fbsql/php_fbsql.c:1.85 Sat Oct 5 22:10:19 2002
+++ php4/ext/fbsql/php_fbsql.c Thu Oct 24 09:14:34 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.85 2002/10/06 02:10:19 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.86 2002/10/24 13:14:34 sas Exp $ */
/* TODO:
*
@@ -42,11 +42,10 @@
#include "ext/standard/info.h"
#include "ext/standard/php_string.h"
-#if WIN32|WINNT
+#ifdef PHP_WIN32
#include <winsock.h>
#else
#include <php_config.h>
-#include <build-defs.h>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
Index: php4/ext/filepro/filepro.c
diff -u php4/ext/filepro/filepro.c:1.46 php4/ext/filepro/filepro.c:1.47
--- php4/ext/filepro/filepro.c:1.46 Thu Jun 27 02:54:51 2002
+++ php4/ext/filepro/filepro.c Thu Oct 24 09:14:35 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filepro.c,v 1.46 2002/06/27 06:54:51 derick Exp $ */
+/* $Id: filepro.c,v 1.47 2002/10/24 13:14:35 sas Exp $ */
/*
filePro 4.x support developed by Chad Robinson, [EMAIL PROTECTED]
@@ -151,7 +151,7 @@
#ifdef COMPILE_DL_FILEPRO
ZEND_GET_MODULE(filepro)
-#if (WIN32|WINNT) && defined(THREAD_SAFE)
+#if defined(PHP_WIN32) && defined(THREAD_SAFE)
/*NOTE: You should have an odbc.def file where you
export DllMain*/
Index: php4/ext/gd/gdcache.c
diff -u php4/ext/gd/gdcache.c:1.4 php4/ext/gd/gdcache.c:1.5
--- php4/ext/gd/gdcache.c:1.4 Thu Aug 19 02:32:07 1999
+++ php4/ext/gd/gdcache.c Thu Oct 24 09:14:35 2002
@@ -1,5 +1,5 @@
/*
- * $Id: gdcache.c,v 1.4 1999/08/19 06:32:07 rasmus Exp $
+ * $Id: gdcache.c,v 1.5 2002/10/24 13:14:35 sas Exp $
*
* Caches of pointers to user structs in which the least-recently-used
* element is replaced in the event of a cache miss after the cache has
@@ -37,7 +37,7 @@
*/
/* This just seems unessacary */
-#if (WIN32|WINNT)
+#if PHP_WIN32
#define ENABLE_GD_TTF
#else
#include "php_config.h"
Index: php4/ext/hwapi/hwapi.cpp
diff -u php4/ext/hwapi/hwapi.cpp:1.1 php4/ext/hwapi/hwapi.cpp:1.2
--- php4/ext/hwapi/hwapi.cpp:1.1 Wed Apr 10 09:33:57 2002
+++ php4/ext/hwapi/hwapi.cpp Thu Oct 24 09:14:36 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hwapi.cpp,v 1.1 2002/04/10 13:33:57 steinm Exp $ */
+/* $Id: hwapi.cpp,v 1.2 2002/10/24 13:14:36 sas Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -25,17 +25,17 @@
{
#include "php.h"
#include "php_globals.h"
-//#include "ext/standard/php_standard.h"
#include "ext/standard/head.h"
#include "ext/standard/info.h"
-//#include "fopen-wrappers.h"
+#if 0
+#include "ext/standard/php_standard.h"
+#include "fopen-wrappers.h"
+#endif
#include "SAPI.h"
}
#ifdef PHP_WIN32
#include <winsock.h>
-#else
-#include "build-defs.h"
#endif
#ifdef HAVE_MMAP
#include <sys/mman.h>
Index: php4/ext/hyperwave/hw.c
diff -u php4/ext/hyperwave/hw.c:1.110 php4/ext/hyperwave/hw.c:1.111
--- php4/ext/hyperwave/hw.c:1.110 Mon Sep 30 05:27:54 2002
+++ php4/ext/hyperwave/hw.c Thu Oct 24 09:14:36 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hw.c,v 1.110 2002/09/30 09:27:54 steinm Exp $ */
+/* $Id: hw.c,v 1.111 2002/10/24 13:14:36 sas Exp $ */
#include <stdlib.h>
#include <errno.h>
@@ -35,8 +35,6 @@
#ifdef PHP_WIN32
#include <winsock.h>
-#else
-#include "build-defs.h"
#endif
#if HYPERWAVE
Index: php4/ext/imap/php_imap.h
diff -u php4/ext/imap/php_imap.h:1.23 php4/ext/imap/php_imap.h:1.24
--- php4/ext/imap/php_imap.h:1.23 Mon Aug 5 17:53:09 2002
+++ php4/ext/imap/php_imap.h Thu Oct 24 09:14:37 2002
@@ -27,16 +27,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_imap.h,v 1.23 2002/08/05 21:53:09 kalowsky Exp $ */
+/* $Id: php_imap.h,v 1.24 2002/10/24 13:14:37 sas Exp $ */
#ifndef PHP_IMAP_H
#define PHP_IMAP_H
#if HAVE_IMAP
-
-#ifndef PHP_WIN32
-#include "build-defs.h"
-#endif
#if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001)
/* these are used for quota support */
Index: php4/ext/informix/ifx.ec
diff -u php4/ext/informix/ifx.ec:1.68 php4/ext/informix/ifx.ec:1.69
--- php4/ext/informix/ifx.ec:1.68 Mon Jul 22 04:58:16 2002
+++ php4/ext/informix/ifx.ec Thu Oct 24 09:14:37 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ifx.ec,v 1.68 2002/07/22 08:58:16 sniper Exp $ */
+/* $Id: ifx.ec,v 1.69 2002/10/24 13:14:37 sas Exp $ */
/* -------------------------------------------------------------------
* if you want a function reference : "grep '^\*\*' ifx.ec" will give
@@ -47,13 +47,17 @@
#ifdef PHP_WIN32
#include <winsock.h>
-#else
-#include "build-defs.h"
+#endif
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
+
+#if HAVE_NETDB_H
#include <netdb.h>
+#endif
+
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
Index: php4/ext/mcal/php_mcal.h
diff -u php4/ext/mcal/php_mcal.h:1.11 php4/ext/mcal/php_mcal.h:1.12
--- php4/ext/mcal/php_mcal.h:1.11 Tue Aug 7 16:13:52 2001
+++ php4/ext/mcal/php_mcal.h Thu Oct 24 09:14:38 2002
@@ -1,13 +1,9 @@
-/* $Id: php_mcal.h,v 1.11 2001/08/07 20:13:52 sniper Exp $ */
+/* $Id: php_mcal.h,v 1.12 2002/10/24 13:14:38 sas Exp $ */
#ifndef PHP_MCAL_H
#define PHP_MCAL_H
#if HAVE_MCAL
-
-#ifndef PHP_WIN32
-#include "build-defs.h"
-#endif
/* Functions accessable to PHP */
extern zend_module_entry php_mcal_module_entry;
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.168 php4/ext/mysql/php_mysql.c:1.169
--- php4/ext/mysql/php_mysql.c:1.168 Thu Oct 17 03:24:04 2002
+++ php4/ext/mysql/php_mysql.c Thu Oct 24 09:14:39 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.168 2002/10/17 07:24:04 yohgaki Exp $ */
+/* $Id: php_mysql.c,v 1.169 2002/10/24 13:14:39 sas Exp $ */
/* TODO:
*
@@ -43,7 +43,6 @@
# include <sys/socket.h>
# define signal(a, b) NULL
#else
-# include "build-defs.h"
# if HAVE_SIGNAL_H
# include <signal.h>
# endif
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.181 php4/ext/oci8/oci8.c:1.182
--- php4/ext/oci8/oci8.c:1.181 Mon Oct 21 07:00:40 2002
+++ php4/ext/oci8/oci8.c Thu Oct 24 09:14:40 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.181 2002/10/21 11:00:40 thies Exp $ */
+/* $Id: oci8.c,v 1.182 2002/10/24 13:14:40 sas Exp $ */
/* TODO list:
*
@@ -124,10 +124,6 @@
} \
}
-#ifndef PHP_WIN32
-#include "build-defs.h"
-#endif
-
#include <fcntl.h>
#ifndef O_BINARY
@@ -631,7 +627,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.181 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.182 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
Index: php4/ext/odbc/php_odbc.c
diff -u php4/ext/odbc/php_odbc.c:1.141 php4/ext/odbc/php_odbc.c:1.142
--- php4/ext/odbc/php_odbc.c:1.141 Wed Aug 14 16:40:48 2002
+++ php4/ext/odbc/php_odbc.c Thu Oct 24 09:14:41 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.141 2002/08/14 20:40:48 kalowsky Exp $ */
+/* $Id: php_odbc.c,v 1.142 2002/10/24 13:14:41 sas Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -49,8 +49,6 @@
#define ODBC_TYPE "Win32"
#define PHP_ODBC_TYPE ODBC_TYPE
-#else
-#include "build-defs.h"
#endif
/*
Index: php4/ext/oracle/oracle.c
diff -u php4/ext/oracle/oracle.c:1.79 php4/ext/oracle/oracle.c:1.80
--- php4/ext/oracle/oracle.c:1.79 Thu Apr 25 13:20:05 2002
+++ php4/ext/oracle/oracle.c Thu Oct 24 09:14:42 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oracle.c,v 1.79 2002/04/25 17:20:05 edink Exp $ */
+/* $Id: oracle.c,v 1.80 2002/10/24 13:14:42 sas Exp $ */
/* comment out the next line if you're on Oracle 7.x and don't have the olog
call. */
@@ -52,10 +52,6 @@
#else
#define PHP_ORA_API
#endif
-
-#ifndef PHP_WIN32
-#include "build-defs.h"
-#endif
#ifdef ZTS
int ora_globals_id;
Index: php4/ext/standard/dl.c
diff -u php4/ext/standard/dl.c:1.75 php4/ext/standard/dl.c:1.76
--- php4/ext/standard/dl.c:1.75 Tue Oct 22 03:00:51 2002
+++ php4/ext/standard/dl.c Thu Oct 24 09:14:42 2002
@@ -18,17 +18,13 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dl.c,v 1.75 2002/10/22 07:00:51 fmk Exp $ */
+/* $Id: dl.c,v 1.76 2002/10/24 13:14:42 sas Exp $ */
#include "php.h"
#include "dl.h"
#include "php_globals.h"
#include "ext/standard/info.h"
#include "SAPI.h"
-
-#if !defined(PHP_WIN32) && !defined(NETWARE)
-#include "build-defs.h"
-#endif
#if defined(HAVE_LIBDL) || HAVE_MACH_O_DYLD_H
#include <stdlib.h>
Index: php4/ext/standard/fsock.c
diff -u php4/ext/standard/fsock.c:1.105 php4/ext/standard/fsock.c:1.106
--- php4/ext/standard/fsock.c:1.105 Sun Oct 13 18:01:39 2002
+++ php4/ext/standard/fsock.c Thu Oct 24 09:14:42 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fsock.c,v 1.105 2002/10/13 22:01:39 wez Exp $ */
+/* $Id: fsock.c,v 1.106 2002/10/24 13:14:42 sas Exp $ */
/* converted to PHP Streams and moved much code to main/network.c [wez] */
@@ -105,8 +105,6 @@
#ifdef USE_WINSOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
#endif
-#else
-#include "build-defs.h"
#endif
/* {{{ php_lookup_hostname */
Index: php4/ext/standard/info.c
diff -u php4/ext/standard/info.c:1.217 php4/ext/standard/info.c:1.218
--- php4/ext/standard/info.c:1.217 Fri Oct 11 23:11:28 2002
+++ php4/ext/standard/info.c Thu Oct 24 09:14:43 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: info.c,v 1.217 2002/10/12 03:11:28 iliaa Exp $ */
+/* $Id: info.c,v 1.218 2002/10/24 13:14:43 sas Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -31,9 +31,6 @@
#include "SAPI.h"
#include <time.h>
#include "php_main.h"
-#if !defined(PHP_WIN32) && !defined(NETWARE)
-#include "build-defs.h"
-#endif
#include "zend_globals.h" /* needs ELS */
#include "zend_extensions.h"
#ifdef HAVE_SYS_UTSNAME_H
Index: php4/ext/standard/mail.c
diff -u php4/ext/standard/mail.c:1.65 php4/ext/standard/mail.c:1.66
--- php4/ext/standard/mail.c:1.65 Sun Sep 22 12:23:44 2002
+++ php4/ext/standard/mail.c Thu Oct 24 09:14:43 2002
@@ -16,22 +16,21 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mail.c,v 1.65 2002/09/22 16:23:44 derick Exp $ */
+/* $Id: mail.c,v 1.66 2002/10/24 13:14:43 sas Exp $ */
#include <stdlib.h>
#include <ctype.h>
#include <stdio.h>
#include "php.h"
#include "ext/standard/info.h"
-#if !defined(PHP_WIN32) && !defined(NETWARE)
-#include "build-defs.h"
+
#if HAVE_SYSEXITS_H
#include <sysexits.h>
#endif
#if HAVE_SYS_SYSEXITS_H
#include <sys/sysexits.h>
#endif
-#endif
+
#include "php_mail.h"
#include "php_ini.h"
#include "safe_mode.h"
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.109 php4/ext/xml/xml.c:1.110
--- php4/ext/xml/xml.c:1.109 Fri Sep 6 06:34:30 2002
+++ php4/ext/xml/xml.c Thu Oct 24 09:14:44 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.109 2002/09/06 10:34:30 imajes Exp $ */
+/* $Id: xml.c,v 1.110 2002/10/24 13:14:44 sas Exp $ */
#define IS_EXT_MODULE
@@ -35,9 +35,6 @@
#if HAVE_LIBEXPAT
-#if !defined(PHP_WIN32) && !defined(NETWARE)
-# include "build-defs.h"
-# endif
# include "ext/standard/head.h"
/* Short-term TODO list:
Index: php4/main/main.c
diff -u php4/main/main.c:1.504 php4/main/main.c:1.505
--- php4/main/main.c:1.504 Wed Oct 23 14:32:55 2002
+++ php4/main/main.c Thu Oct 24 09:14:44 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.504 2002/10/23 18:32:55 moriyoshi Exp $ */
+/* $Id: main.c,v 1.505 2002/10/24 13:14:44 sas Exp $ */
/* {{{ includes
*/
@@ -40,8 +40,6 @@
#ifdef USE_WINSOCK
#include <novsock2.h>
#endif
-#else
-#include "build-defs.h"
#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
Index: php4/main/php.h
diff -u php4/main/php.h:1.176 php4/main/php.h:1.177
--- php4/main/php.h:1.176 Wed Sep 25 11:25:12 2002
+++ php4/main/php.h Thu Oct 24 09:14:45 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.176 2002/09/25 15:25:12 wez Exp $ */
+/* $Id: php.h,v 1.177 2002/10/24 13:14:45 sas Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -62,9 +62,13 @@
#endif
#ifdef NETWARE
-#define PHP_UNAME "NetWare" /* For php_get_uname() function */
-#define PHP_OS PHP_UNAME /* This is obtained using 'uname' on Unix and assigned
in the case of Windows;
- we'll do it this way atleast for now */
+/* For php_get_uname() function */
+#define PHP_UNAME "NetWare"
+/*
+ * This is obtained using uname(2) on Unix and assigned in the case of Windows;
+ * we'll do it this way at least for now.
+ */
+#define PHP_OS PHP_UNAME
#endif
#include "php_regex.h"
@@ -90,6 +94,10 @@
#if HAVE_ALLOCA_H
#include <alloca.h>
+#endif
+
+#if HAVE_BUILD_DEFS_H
+#include "build-defs.h"
#endif
/*
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.104 php4/main/php_ini.c:1.105
--- php4/main/php_ini.c:1.104 Fri Oct 4 00:47:35 2002
+++ php4/main/php_ini.c Thu Oct 24 09:14:45 2002
@@ -16,15 +16,12 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.104 2002/10/04 04:47:35 rasmus Exp $ */
+/* $Id: php_ini.c,v 1.105 2002/10/24 13:14:45 sas Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
#include "php.h"
-#if !defined(PHP_WIN32) && !defined(NETWARE)
-#include "build-defs.h"
-#endif
#include "ext/standard/info.h"
#include "zend_ini.h"
#include "php_ini.h"
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.116 php4/main/streams.c:1.117
--- php4/main/streams.c:1.116 Tue Oct 22 11:34:50 2002
+++ php4/main/streams.c Thu Oct 24 09:14:47 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.116 2002/10/22 15:34:50 iliaa Exp $ */
+/* $Id: streams.c,v 1.117 2002/10/24 13:14:47 sas Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -45,8 +45,6 @@
#ifdef PHP_WIN32
#define EWOULDBLOCK WSAEWOULDBLOCK
-#else
-#include "build-defs.h"
#endif
#define STREAM_DEBUG 0
Index: php4/regex/regex_extra.h
diff -u php4/regex/regex_extra.h:1.3 php4/regex/regex_extra.h:1.4
--- php4/regex/regex_extra.h:1.3 Sat Nov 13 13:33:28 1999
+++ php4/regex/regex_extra.h Thu Oct 24 09:14:48 2002
@@ -7,7 +7,7 @@
#if (defined(REGEX) && REGEX == 1) || (!defined(REGEX))
-#if !(WIN32|WINNT)
+#ifndef PHP_WIN32
#ifndef PHP_NO_ALIASES
Index: php4/sapi/apache/php_apache.c
diff -u php4/sapi/apache/php_apache.c:1.68 php4/sapi/apache/php_apache.c:1.69
--- php4/sapi/apache/php_apache.c:1.68 Thu Sep 26 13:54:54 2002
+++ php4/sapi/apache/php_apache.c Thu Oct 24 09:14:48 2002
@@ -17,15 +17,13 @@
| David Sklar <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_apache.c,v 1.68 2002/09/26 17:54:54 cmv Exp $ */
+/* $Id: php_apache.c,v 1.69 2002/10/24 13:14:48 sas Exp $ */
#include "php_apache_http.h"
#if defined(PHP_WIN32) || defined(NETWARE)
#include "zend.h"
#include "ap_compat.h"
-#else
-#include "build-defs.h"
#endif
#ifdef ZTS
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.183 php4/sapi/cgi/cgi_main.c:1.184
--- php4/sapi/cgi/cgi_main.c:1.183 Sun Oct 13 05:40:44 2002
+++ php4/sapi/cgi/cgi_main.c Thu Oct 24 09:14:48 2002
@@ -34,8 +34,6 @@
#include "win32/time.h"
#include "win32/signal.h"
#include <process.h>
-#else
-#include "build-defs.h"
#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.38 php4/sapi/cli/php_cli.c:1.39
--- php4/sapi/cli/php_cli.c:1.38 Tue Oct 22 21:21:40 2002
+++ php4/sapi/cli/php_cli.c Thu Oct 24 09:14:49 2002
@@ -33,8 +33,6 @@
#include "win32/time.h"
#include "win32/signal.h"
#include <process.h>
-#else
-#include "build-defs.h"
#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
Index: php4/sapi/servlet/servlet.c
diff -u php4/sapi/servlet/servlet.c:1.64 php4/sapi/servlet/servlet.c:1.65
--- php4/sapi/servlet/servlet.c:1.64 Wed Sep 18 17:57:35 2002
+++ php4/sapi/servlet/servlet.c Thu Oct 24 09:14:49 2002
@@ -29,8 +29,6 @@
#include "win32/time.h"
#include "win32/signal.h"
#include <process.h>
-#else
-#include "build-defs.h"
#endif
#if HAVE_SYS_TIME_H
#include <sys/time.h>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
