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.13 by schorsch, Sun Jun 8 12:01:52 2003 UTC vs.
Revision 2.14 by schorsch, Thu Jun 26 00:58:09 2003 UTC

# Line 13 | Line 13 | extern "C" {
13   #include <stdlib.h>
14   #include <string.h>
15   #ifdef _WIN32
16 < #include <io.h>
17 < #define access _access
18 < #define PATH_MAX _MAX_PATH
16 >  #include <io.h>
17   #else /* _WIN32 */
18 < #include <unistd.h>
19 < #include <sys/param.h>
18 >  #include <unistd.h>
19 >  #include <sys/param.h>
20   #endif /* _WIN32 */
21  
22   #ifdef _WIN32
23  
24 < #define DIRSEP          '/'
25 < #define ISDIRSEP(c)     ((c)=='/' || (c)=='\\')
26 < #define ISABS(s)        ((s)!=NULL \
27 <        && (s[0])!='\0' \
28 <        && (   ISDIRSEP(s[0]) \
29 <            || (   (s[1])!='\0' \
30 <                && (isupper(s[0])||islower(s[0])) \
31 <                && (s[1])==':')))
32 < #define CASEDIRSEP      case '/': case '\\'
33 < #define PATHSEP         ';'
34 < #define MAXPATH         128
35 < #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
36 < #define TEMPLATE        "rtXXXXXX"
37 < #define TEMPLEN         8
38 < #define ULIBVAR         "RAYPATH"
39 < #ifndef DEFPATH
40 < #define DEFPATH         ";c:/ray/lib"
41 < #endif
42 < /* <io.h> only does half the work for access() */
43 < #ifndef F_OK
44 < #define  F_OK 00
45 < #define  W_OK 02
46 < #define  R_OK 04
47 < #endif
24 >  #define access _access
25 >  #define PATH_MAX _MAX_PATH
26 >  #define DIRSEP                '/'
27 >  #define ISDIRSEP(c)   ((c)=='/' || (c)=='\\')
28 >  #define ISABS(s)      ((s)!=NULL \
29 >                  && (s[0])!='\0' \
30 >          && (   ISDIRSEP(s[0]) \
31 >              || (   (s[1])!='\0' \
32 >                  && (isupper(s[0])||islower(s[0])) \
33 >                  && (s[1])==':')))
34 >  #define CASEDIRSEP    case '/': case '\\'
35 >  #define PATHSEP               ';'
36 >  #define CURDIR                '.'
37 >  #define MAXPATH               512 /* XXX obsoleted by posix PATH_MAX */
38 >  #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
39 >  #define TEMPLATE      "rtXXXXXX"
40 >  #define TEMPLEN               8
41 >  #define ULIBVAR               "RAYPATH"
42 >  #ifndef DEFPATH
43 >    #define DEFPATH             ";c:/ray/lib"
44 >  #endif
45 >  /* <io.h> only does half the work for access() */
46 >  #ifndef F_OK
47 >    #define  F_OK 00
48 >    #define  X_OK 01
49 >    #define  W_OK 02
50 >    #define  R_OK 04
51 >  #endif
52   extern char  *fixargv0();
53  
54   #else
55 < #ifdef AMIGA
55 >  #ifndef PATH_MAX /* doesn't implement posix? */
56 >    #define PATH_MAX 512 /* quite conservative (I think...) */
57 >  #endif
58  
59 < #define DIRSEP          '/'
56 < #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
57 < #define PATHSEP         ';'
58 < #define MAXPATH         128
59 < #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
60 < #define TEMPLATE        "/tmp/rtXXXXXX"
61 < #define TEMPLEN         13
62 < #define ULIBVAR         "RAYPATH"
63 < #ifndef DEFPATH
64 < #define DEFPATH         ";/ray/lib"
65 < #endif
66 < #define  fixargv0(a0)   (a0)
59 >  #ifdef AMIGA
60  
61 < #else
61 >    #define DIRSEP              '/'
62 >    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
63 >    #define PATHSEP             ';'
64 >        #define CURDIR          '.'
65 >    #define MAXPATH             128
66 >    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
67 >    #define TEMPLATE    "/tmp/rtXXXXXX"
68 >    #define TEMPLEN             13
69 >    #define ULIBVAR             "RAYPATH"
70 >    #ifndef DEFPATH
71 >      #define DEFPATH           ";/ray/lib"
72 >    #endif
73 >    #define      fixargv0(a0)   (a0)
74  
75 < #define DIRSEP          '/'
71 < #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
72 < #define PATHSEP         ':'
73 < #define MAXPATH         256
74 < #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
75 < #define TEMPLATE        "/usr/tmp/rtXXXXXX"
76 < #define TEMPLEN         17
77 < #define ULIBVAR         "RAYPATH"
78 < #ifndef DEFPATH
79 < #define DEFPATH         ":/usr/local/lib/ray"
80 < #endif
81 < #define  fixargv0(a0)   (a0)
75 >  #else
76  
77 +    #define DIRSEP              '/'
78 +    #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
79 +    #define PATHSEP             ':'
80 +        #define CURDIR          '.'
81 +    #define MAXPATH             256
82 +    #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
83 +    #define TEMPLATE    "/usr/tmp/rtXXXXXX"
84 +    #define TEMPLEN             17
85 +    #define ULIBVAR             "RAYPATH"
86 +    #ifndef DEFPATH
87 +      #define DEFPATH           ":/usr/local/lib/ray"
88 +    #endif
89 +    #define      fixargv0(a0)   (a0)
90 +
91 +  #endif
92   #endif
84 – #endif
93  
94   #ifndef ISDIRSEP
95 < #define ISDIRSEP(c)     ((c)==DIRSEP)
95 >  #define ISDIRSEP(c)   ((c)==DIRSEP)
96   #endif
97   #ifndef CASEDIRSEP
98 < #define CASEDIRSEP      case DIRSEP
98 >  #define CASEDIRSEP    case DIRSEP
99   #endif
100  
101   extern char  *mktemp(), *getenv();

Diff Legend

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