diff options
| author | Sara Golemon <pollita@php.net> | 2003-12-13 18:48:39 +0000 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2003-12-13 18:48:39 +0000 |
| commit | a67bf6ecc9c70cb5faae6034e3d19d3fef0748f5 (patch) | |
| tree | b9188b32933c4fc2a98be25bdf1f773232900375 /main | |
| parent | ec5b38fae9b03c1465e4dd91351d6ea69850f9e3 (diff) | |
| download | php-git-a67bf6ecc9c70cb5faae6034e3d19d3fef0748f5.tar.gz | |
Fix Win32 Build. mkdir/rmdir are macros
Diffstat (limited to 'main')
| -rwxr-xr-x | main/php_streams.h | 4 | ||||
| -rwxr-xr-x | main/streams/streams.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/main/php_streams.h b/main/php_streams.h index 6ba17d54cb..3787bf5d3e 100755 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -153,8 +153,8 @@ typedef struct _php_stream_wrapper_ops { int (*rename)(php_stream_wrapper *wrapper, char *url_from, char *url_to, int options, php_stream_context *context TSRMLS_DC); /* Create/Remove directory */ - int (*mkdir)(php_stream_wrapper *wrapper, char *url, int mode, int options, php_stream_context *context TSRMLS_DC); - int (*rmdir)(php_stream_wrapper *wrapper, char *url, int options, php_stream_context *context TSRMLS_DC); + int (*stream_mkdir)(php_stream_wrapper *wrapper, char *url, int mode, int options, php_stream_context *context TSRMLS_DC); + int (*stream_rmdir)(php_stream_wrapper *wrapper, char *url, int options, php_stream_context *context TSRMLS_DC); } php_stream_wrapper_ops; struct _php_stream_wrapper { diff --git a/main/streams/streams.c b/main/streams/streams.c index dc1c7c3631..1c2ba2276b 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1464,11 +1464,11 @@ PHPAPI int _php_stream_mkdir(char *path, int mode, int options, php_stream_conte php_stream_wrapper *wrapper = NULL; wrapper = php_stream_locate_url_wrapper(path, NULL, ENFORCE_SAFE_MODE TSRMLS_CC); - if (!wrapper || !wrapper->wops || !wrapper->wops->mkdir) { + if (!wrapper || !wrapper->wops || !wrapper->wops->stream_mkdir) { return 0; } - return wrapper->wops->mkdir(wrapper, path, mode, options, context TSRMLS_CC); + return wrapper->wops->stream_mkdir(wrapper, path, mode, options, context TSRMLS_CC); } /* }}} */ @@ -1479,11 +1479,11 @@ PHPAPI int _php_stream_rmdir(char *path, int options, php_stream_context *contex php_stream_wrapper *wrapper = NULL; wrapper = php_stream_locate_url_wrapper(path, NULL, ENFORCE_SAFE_MODE TSRMLS_CC); - if (!wrapper || !wrapper->wops || !wrapper->wops->rmdir) { + if (!wrapper || !wrapper->wops || !wrapper->wops->stream_rmdir) { return 0; } - return wrapper->wops->rmdir(wrapper, path, options, context TSRMLS_CC); + return wrapper->wops->stream_rmdir(wrapper, path, options, context TSRMLS_CC); } /* }}} */ |