ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/paths.h
(Generate patch)

Comparing ray/src/common/paths.h (file contents):
Revision 2.21 by greg, Sat Oct 30 04:59:41 2004 UTC vs.
Revision 2.24 by greg, Fri Jun 29 23:09:06 2012 UTC

# Line 14 | Line 14
14  
15   #ifdef _WIN32
16    #include <io.h>
17 <  #include <direct.h> /* getcwd(), chdir(), etc. */
17 >  #include <direct.h> /* getcwd(), chdir(), _mkdir(), etc. */
18  
19    #define access _access
20 +  #define mkdir(dirname,perms) _mkdir(dirname)
21    #define PATH_MAX _MAX_PATH
22    #define NULL_DEVICE   "NUL"
23    #define DIRSEP                '/'
24 <  #define ISDIRSEP(c)   ((c)=='/' || (c)=='\\')
25 <  #define ISABS(s)      ((s)!=NULL \
26 <                  && (s[0])!='\0' \
27 <          && (   ISDIRSEP(s[0]) \
27 <              || (   (s[1])!='\0' \
28 <                  && (isupper(s[0])||islower(s[0])) \
29 <                  && (s[1])==':')))
24 >  #define ISDIRSEP(c)   (((c)=='/') | ((c)=='\\'))
25 >  #define ISABS(s)      ( ISDIRSEP((s)[0]) \
26 >                || ( isupper((s)[0]) | islower((s)[0]) \
27 >                        && (s)[1]==':' && ISDIRSEP((s)[2]) ) )
28    #define CASEDIRSEP    case '/': case '\\'
29    #define PATHSEP               ';'
30    #define CURDIR                '.'
# Line 40 | Line 38
38    /* <io.h> only does half the work for access() */
39    #ifndef F_OK
40      #define  F_OK 00
43 –    #define  X_OK 01
41      #define  W_OK 02
45 –    #define  R_OK 04
42    #endif
43 +  #ifndef R_OK
44 +    #define X_OK 01
45 +    #define R_OK 04
46 +  #endif
47    /* to make the permissions user specific we'd need to use CreateFile() */
48    #ifndef S_IRUSR
49      #define S_IRUSR _S_IREAD
# Line 74 | Line 74
74  
75          #define NULL_DEVICE     "NIL:"
76      #define DIRSEP              '/'
77 <    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
77 >    #define ISABS(s)            ISDIRSEP((s)[0])
78      #define PATHSEP             ';'
79          #define CURDIR          '.'
80      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
# Line 93 | Line 93
93          /* this is defined as _PATH_DEVNULL in /usr/include/paths.h on Linux */
94          #define NULL_DEVICE     "/dev/null"
95      #define DIRSEP              '/'
96 <    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
96 >    #define ISABS(s)            ISDIRSEP((s)[0])
97      #define PATHSEP             ':'
98          #define CURDIR          '.'
99      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines