summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2002-10-24 13:15:49 +0000
committerSascha Schumann <sas@php.net>2002-10-24 13:15:49 +0000
commit2909e5c9c9313d25aa2dc85ea63ea51916043234 (patch)
tree7ccd1e817c174a33458372b4e0e7057890c87e3f /ext/standard
parent26617f8b5f02a9bac6999e57315245626ccafb62 (diff)
downloadphp-git-2909e5c9c9313d25aa2dc85ea63ea51916043234.tar.gz
centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/dl.c4
-rw-r--r--ext/standard/fsock.c2
-rw-r--r--ext/standard/info.c3
-rw-r--r--ext/standard/mail.c5
4 files changed, 2 insertions, 12 deletions
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index cdde02ab6f..90ecf3d4cc 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -26,10 +26,6 @@
#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>
#include <stdio.h>
diff --git a/ext/standard/fsock.c b/ext/standard/fsock.c
index 629cb720a5..64281e6c61 100644
--- a/ext/standard/fsock.c
+++ b/ext/standard/fsock.c
@@ -105,8 +105,6 @@ static int fsock_globals_id;
#ifdef USE_WINSOCK
#define EWOULDBLOCK WSAEWOULDBLOCK
#endif
-#else
-#include "build-defs.h"
#endif
/* {{{ php_lookup_hostname */
diff --git a/ext/standard/info.c b/ext/standard/info.c
index 6dfccf4ace..294e48e8cb 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -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
diff --git a/ext/standard/mail.c b/ext/standard/mail.c
index c81e33a442..e678bcc86e 100644
--- a/ext/standard/mail.c
+++ b/ext/standard/mail.c
@@ -23,15 +23,14 @@
#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"