Fix Win32 Build. mkdir/rmdir are macros

diff --git a/main/php_streams.h b/main/php_streams.h
index 6ba17d54cb5b3cfc06f00fcce9ee9c9fbbf0479d..3787bf5d3e8156d91ef80cb8cba0339faf0e6c06 100755 (executable)
--- 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 dc1c7c3631eaca6aaae668a7ca8b11933639857f..1c2ba2276bd5172732cd31d8000daa6978270150 100755 (executable)
--- 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);
 }
 /* }}} */