diff options
| author | Anatol Belski <ab@php.net> | 2015-05-25 13:47:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-05-25 18:03:28 +0200 |
| commit | c444c4172f219b7461e2d38e1bbd87f9eeb2a0cd (patch) | |
| tree | f2cd1de69efe091997abe30d239dff3a1cbbb5c7 /main | |
| parent | cfadcfc73486828b53ec45217fd00659a1a2e918 (diff) | |
| download | php-git-c444c4172f219b7461e2d38e1bbd87f9eeb2a0cd.tar.gz | |
further cleanups with S_IF* macros generalized declarations
Diffstat (limited to 'main')
| -rw-r--r-- | main/fopen_wrappers.c | 4 | ||||
| -rw-r--r-- | main/main.c | 4 | ||||
| -rw-r--r-- | main/php_ini.c | 4 | ||||
| -rw-r--r-- | main/streams/php_streams_int.h | 4 | ||||
| -rw-r--r-- | main/win95nt.h | 3 |
5 files changed, 0 insertions, 19 deletions
diff --git a/main/fopen_wrappers.c b/main/fopen_wrappers.c index 85127c3379..a4c6e4a6db 100644 --- a/main/fopen_wrappers.c +++ b/main/fopen_wrappers.c @@ -53,10 +53,6 @@ #include <sys/socket.h> #endif -#ifndef S_ISREG -#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) -#endif - #ifdef PHP_WIN32 #include <winsock2.h> #elif defined(NETWARE) && defined(USE_WINSOCK) diff --git a/main/main.c b/main/main.c index ebaaa2a8e4..2d58b9c99c 100644 --- a/main/main.c +++ b/main/main.c @@ -114,10 +114,6 @@ #endif /* }}} */ -#ifndef S_ISREG -#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) -#endif - PHPAPI int (*php_register_internal_extensions_func)(void) = php_register_internal_extensions; #ifndef ZTS diff --git a/main/php_ini.c b/main/php_ini.c index 80d34848f8..99919ca56e 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -37,10 +37,6 @@ #include <dirent.h> #endif -#ifndef S_ISREG -#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) -#endif - #ifdef PHP_WIN32 #define TRANSLATE_SLASHES_LOWER(path) \ { \ diff --git a/main/streams/php_streams_int.h b/main/streams/php_streams_int.h index c47c666178..0188202c91 100644 --- a/main/streams/php_streams_int.h +++ b/main/streams/php_streams_int.h @@ -55,10 +55,6 @@ # define EWOULDBLOCK WSAEWOULDBLOCK #endif -#ifndef S_ISREG -#define S_ISREG(mode) (((mode)&S_IFMT) == S_IFREG) -#endif - /* This functions transforms the first char to 'w' if it's not 'r', 'a' or 'w' * and strips any subsequent chars except '+' and 'b'. * Use this to sanitize stream->mode if you call e.g. fdopen, fopencookie or diff --git a/main/win95nt.h b/main/win95nt.h index adf9f61e34..12356eeccd 100644 --- a/main/win95nt.h +++ b/main/win95nt.h @@ -40,9 +40,6 @@ typedef char * caddr_t; #define S_IFIFO _IFIFO #define S_IFBLK _IFBLK #define S_IFLNK _IFLNK -#ifndef S_ISREG -#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) -#endif #define chdir(path) _chdir(path) #define mkdir(a, b) _mkdir(a) #define rmdir(a) _rmdir(a) |