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

Comparing ray/src/common/paths.h (file contents):
Revision 2.18 by schorsch, Mon Jul 14 20:02:29 2003 UTC vs.
Revision 2.21 by greg, Sat Oct 30 04:59:41 2004 UTC

# Line 4 | Line 4
4   */
5   #ifndef _RAD_PATHS_H_
6   #define _RAD_PATHS_H_
7 – #ifdef __cplusplus
8 – extern "C" {
9 – #endif
7  
8   #include <stdio.h>
9   #include <stdlib.h>
# Line 21 | Line 18 | extern "C" {
18  
19    #define access _access
20    #define PATH_MAX _MAX_PATH
21 +  #define NULL_DEVICE   "NUL"
22    #define DIRSEP                '/'
23    #define ISDIRSEP(c)   ((c)=='/' || (c)=='\\')
24    #define ISABS(s)      ((s)!=NULL \
# Line 51 | Line 49 | extern "C" {
49      #define S_IRUSR _S_IREAD
50      #define S_IWUSR _S_IWRITE
51    #endif
54 – extern char  *fixargv0();
52  
53 +  #ifdef __cplusplus
54 +    extern "C" {
55 +  #endif
56 +  extern char  *fixargv0();
57 +  #ifdef __cplusplus
58 +    }
59 +  #endif
60 +
61   #else /* everything but Windows */
62    #include <unistd.h>
63    #include <sys/param.h>
# Line 67 | Line 72 | extern char  *fixargv0();
72  
73    #ifdef AMIGA
74  
75 +        #define NULL_DEVICE     "NIL:"
76      #define DIRSEP              '/'
77      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
78      #define PATHSEP             ';'
# Line 91 | Line 97 | extern char  *fixargv0();
97      #define PATHSEP             ':'
98          #define CURDIR          '.'
99      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
100 <    #define TEMPLATE    "/usr/tmp/rtXXXXXX"
100 >    #define TEMPLATE    "/tmp/rtXXXXXX"
101      #define TEMPLEN             17
102      #define ULIBVAR             "RAYPATH"
103      #ifndef DEFPATH
# Line 109 | Line 115 | extern char  *fixargv0();
115    #define CASEDIRSEP    case DIRSEP
116   #endif
117  
118 + #ifdef __cplusplus
119 + extern "C" {
120 + #endif
121  
122   /* Find a writeable directory for temporary files */
123   /* If s is NULL, we return a static string */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)