[PHP-CVS] cvs: php-src /main php_streams.h /main/streams streams.c

[Sara Golemon]

pollita         Sat Dec 13 13:48:40 2003 EDT

  Modified files:              
    /php-src/main       php_streams.h 
    /php-src/main/streams       streams.c 
  Log:
  Fix Win32 Build.  mkdir/rmdir are macros
  
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.89 php-src/main/php_streams.h:1.90
--- php-src/main/php_streams.h:1.89     Fri Dec 12 23:07:13 2003
+++ php-src/main/php_streams.h  Sat Dec 13 13:48:37 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_streams.h,v 1.89 2003/12/13 04:07:13 pollita Exp $ */
+/* $Id: php_streams.h,v 1.90 2003/12/13 18:48:37 pollita Exp $ */
 
 #ifndef PHP_STREAMS_H
 #define PHP_STREAMS_H
@@ -153,8 +153,8 @@
        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     {
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.45 php-src/main/streams/streams.c:1.46
--- php-src/main/streams/streams.c:1.45 Fri Dec 12 23:07:14 2003
+++ php-src/main/streams/streams.c      Sat Dec 13 13:48:39 2003
@@ -19,7 +19,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: streams.c,v 1.45 2003/12/13 04:07:14 pollita Exp $ */
+/* $Id: streams.c,v 1.46 2003/12/13 18:48:39 pollita Exp $ */
 
 #define _GNU_SOURCE
 #include "php.h"
@@ -1464,11 +1464,11 @@
        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 @@
        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);
 }
 /* }}} */
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php