diff options
Diffstat (limited to 'main/streams')
| -rw-r--r-- | main/streams/glob_wrapper.c | 4 | ||||
| -rw-r--r-- | main/streams/memory.c | 8 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 8 | ||||
| -rw-r--r-- | main/streams/streams.c | 2 | ||||
| -rw-r--r-- | main/streams/userspace.c | 6 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 2 |
6 files changed, 8 insertions, 22 deletions
diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index d542e336e3..bae22dd6ab 100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c @@ -116,7 +116,7 @@ static void php_glob_stream_path_split(glob_s_t *pglob, const char *path, int ge if ((pos = strrchr(path, '/')) != NULL) { path = pos+1; } -#if defined(PHP_WIN32) || defined(NETWARE) +#ifdef PHP_WIN32 if ((pos = strrchr(path, '\\')) != NULL) { path = pos+1; } @@ -240,7 +240,7 @@ static php_stream *php_glob_stream_opener(php_stream_wrapper *wrapper, const cha if ((tmp = strrchr(pos, '/')) != NULL) { pos = tmp+1; } -#if defined(PHP_WIN32) || defined(NETWARE) +#ifdef PHP_WIN32 if ((tmp = strrchr(pos, '\\')) != NULL) { pos = tmp+1; } diff --git a/main/streams/memory.c b/main/streams/memory.c index a1af61e3f0..39ae8eb603 100644 --- a/main/streams/memory.c +++ b/main/streams/memory.c @@ -214,17 +214,9 @@ static int php_stream_memory_stat(php_stream *stream, php_stream_statbuf *ssb) / ssb->sb.st_size = ms->fsize; ssb->sb.st_mode |= S_IFREG; /* regular file */ - -#ifdef NETWARE - ssb->sb.st_mtime.tv_sec = timestamp; - ssb->sb.st_atime.tv_sec = timestamp; - ssb->sb.st_ctime.tv_sec = timestamp; -#else ssb->sb.st_mtime = timestamp; ssb->sb.st_atime = timestamp; ssb->sb.st_ctime = timestamp; -#endif - ssb->sb.st_nlink = 1; ssb->sb.st_rdev = -1; /* this is only for APC, so use /dev/null device - no chance of conflict there! */ diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 69dd25acc5..7b7d9c0dd9 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -51,7 +51,7 @@ #define php_stream_fopen_from_file_int(file, mode) _php_stream_fopen_from_file_int((file), (mode) STREAMS_CC) #define php_stream_fopen_from_file_int_rel(file, mode) _php_stream_fopen_from_file_int((file), (mode) STREAMS_REL_CC) -#if !defined(WINDOWS) && !defined(NETWARE) +#ifndef PHP_WIN32 extern int php_get_uid_by_name(const char *name, uid_t *uid); extern int php_get_gid_by_name(const char *name, gid_t *gid); #endif @@ -1164,7 +1164,7 @@ static int php_plain_files_rename(php_stream_wrapper *wrapper, const char *url_f zend_stat_t sb; if (php_copy_file(url_from, url_to) == SUCCESS) { if (VCWD_STAT(url_from, &sb) == 0) { -# if !defined(TSRM_WIN32) && !defined(NETWARE) +# ifndef TSRM_WIN32 if (VCWD_CHMOD(url_to, sb.st_mode)) { if (errno == EPERM) { php_error_docref2(NULL, url_from, url_to, E_WARNING, "%s", strerror(errno)); @@ -1325,7 +1325,7 @@ static int php_plain_files_rmdir(php_stream_wrapper *wrapper, const char *url, i static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url, int option, void *value, php_stream_context *context) { struct utimbuf *newtime; -#if !defined(WINDOWS) && !defined(NETWARE) +#ifndef PHP_WIN32 uid_t uid; gid_t gid; #endif @@ -1364,7 +1364,7 @@ static int php_plain_files_metadata(php_stream_wrapper *wrapper, const char *url ret = VCWD_UTIME(url, newtime); break; -#if !defined(WINDOWS) && !defined(NETWARE) +#ifndef PHP_WIN32 case PHP_STREAM_META_OWNER_NAME: case PHP_STREAM_META_OWNER: if(option == PHP_STREAM_META_OWNER_NAME) { diff --git a/main/streams/streams.c b/main/streams/streams.c index 936f9990ab..5049026e80 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1661,7 +1661,7 @@ int php_init_stream_wrappers(int module_number) return (php_stream_xport_register("tcp", php_stream_generic_socket_factory) == SUCCESS && php_stream_xport_register("udp", php_stream_generic_socket_factory) == SUCCESS -#if defined(AF_UNIX) && !(defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE)) +#if defined(AF_UNIX) && !(defined(PHP_WIN32) || defined(__riscos__)) && php_stream_xport_register("unix", php_stream_generic_socket_factory) == SUCCESS && diff --git a/main/streams/userspace.c b/main/streams/userspace.c index 6afa3b095c..8fe4086213 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -859,15 +859,9 @@ static int statbuf_from_array(zval *array, php_stream_statbuf *ssb) STAT_PROP_ENTRY(rdev); #endif STAT_PROP_ENTRY(size); -#ifdef NETWARE - STAT_PROP_ENTRY_EX(atime, atime.tv_sec); - STAT_PROP_ENTRY_EX(mtime, mtime.tv_sec); - STAT_PROP_ENTRY_EX(ctime, ctime.tv_sec); -#else STAT_PROP_ENTRY(atime); STAT_PROP_ENTRY(mtime); STAT_PROP_ENTRY(ctime); -#endif #ifdef HAVE_ST_BLKSIZE STAT_PROP_ENTRY(blksize); #endif diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index fa08a11752..95383ec8e3 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -23,7 +23,7 @@ #include "streams/php_streams_int.h" #include "php_network.h" -#if defined(PHP_WIN32) || defined(__riscos__) || defined(NETWARE) +#if defined(PHP_WIN32) || defined(__riscos__) # undef AF_UNIX #endif |