diff options
| author | Andi Gutmans <andi@php.net> | 2000-10-03 16:36:32 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-10-03 16:36:32 +0000 |
| commit | 94bea2902b2c131ea2bb1bb6d3205e8815e504da (patch) | |
| tree | 963680b5f7afe61d4b9c9c71557e08cb8ca7e5d8 /TSRM | |
| parent | e97718461b24793b9ba6197daddd5d34344e420a (diff) | |
| download | php-git-94bea2902b2c131ea2bb1bb6d3205e8815e504da.tar.gz | |
- Move #define to .h file
Diffstat (limited to 'TSRM')
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.c | 8 | ||||
| -rw-r--r-- | TSRM/tsrm_virtual_cwd.h | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c index c8d41b2f6c..64d58f49bf 100644 --- a/TSRM/tsrm_virtual_cwd.c +++ b/TSRM/tsrm_virtual_cwd.c @@ -70,10 +70,7 @@ cwd_state main_cwd_state; /* True global */ #ifdef TSRM_WIN32 #define tsrm_strtok_r(a,b,c) strtok((a),(b)) -#define DEFAULT_SLASH '\\' #define TOKENIZER_STRING "/\\" - -#define COPY_WHEN_ABSOLUTE 2 static int php_check_dots(const char *element, int n) { @@ -90,7 +87,6 @@ static int php_check_dots(const char *element, int n) #else -#define DEFAULT_SLASH '/' #define TOKENIZER_STRING "/" #endif @@ -107,10 +103,6 @@ static int php_check_dots(const char *element, int n) (len == 1 && ptr[0] == '.') #endif -#ifndef COPY_WHEN_ABSOLUTE -#define COPY_WHEN_ABSOLUTE 0 -#endif - /* define this to check semantics */ #define IS_DIR_OK(s) (1) diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h index eee3ad0480..1ba78a6e4a 100644 --- a/TSRM/tsrm_virtual_cwd.h +++ b/TSRM/tsrm_virtual_cwd.h @@ -46,8 +46,9 @@ /* mode_t isn't defined on Windows */ typedef int mode_t; +#define DEFAULT_SLASH '\\' #define IS_SLASH(c) ((c) == '/' || (c) == '\\') - +#define COPY_WHEN_ABSOLUTE 2 #define IS_ABSOLUTE_PATH(path, len) \ (len >= 2 && isalpha(path[0]) && path[1] == ':') @@ -56,10 +57,16 @@ typedef int mode_t; #include <dirent.h> #endif +#define DEFAULT_SLASH '/' #define IS_SLASH(c) ((c) == '/') #endif + +#ifndef COPY_WHEN_ABSOLUTE +#define COPY_WHEN_ABSOLUTE 0 +#endif + #ifndef IS_ABSOLUTE_PATH #define IS_ABSOLUTE_PATH(path, len) \ (IS_SLASH(path[0])) |