archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix Win32 Build. mkdir/rmdir are macros

Browse source
This commit is contained in:
Sara Golemon 2003-12-13 18:48:39 +00:00
parent ec5b38fae9
commit a67bf6ecc9
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main/php_streams.h
View file

@ -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 {

8
main/streams/streams.c
View file

@ -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);
}
/* }}} */