- Move #define to .h file

diff --git a/TSRM/tsrm_virtual_cwd.c b/TSRM/tsrm_virtual_cwd.c
index c8d41b2f6c5d1144f24d69df31c4d441ec80aa19..64d58f49bf89c4c438f505f49132cb94f1c4f2c2 100644 (file)
--- 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 eee3ad0480c73a68f1ae7f7fef6b40aff37fd1fb..1ba78a6e4a5926969e31237c55a6238089b7432f 100644 (file)
--- 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]))