diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | main/php.h | 14 | ||||
| -rw-r--r-- | main/php_ini.c | 3 | ||||
| -rwxr-xr-x | main/streams.c | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/main/main.c b/main/main.c index 83eaf25f63..98a392759d 100644 --- a/main/main.c +++ b/main/main.c @@ -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> diff --git a/main/php.h b/main/php.h index bbaaeaf183..4cf5e8a7ef 100644 --- a/main/php.h +++ b/main/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" @@ -92,6 +96,10 @@ #include <alloca.h> #endif +#if HAVE_BUILD_DEFS_H +#include "build-defs.h" +#endif + /* * This is a fast version of strlcpy which should be used, if you * know the size of the destination buffer and if you know diff --git a/main/php_ini.c b/main/php_ini.c index f83ceb5c28..e439547809 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -22,9 +22,6 @@ #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" diff --git a/main/streams.c b/main/streams.c index d5e3123052..edeab0488b 100755 --- a/main/streams.c +++ b/main/streams.c @@ -45,8 +45,6 @@ #ifdef PHP_WIN32 #define EWOULDBLOCK WSAEWOULDBLOCK -#else -#include "build-defs.h" #endif #define STREAM_DEBUG 0 |