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.16 by schorsch, Mon Jun 30 14:59:11 2003 UTC vs.
Revision 2.19 by schorsch, Mon Jul 14 22:23:59 2003 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>
10   #include <string.h>
11 + #include <fcntl.h>
12 + #include <sys/types.h>
13 + #include <sys/stat.h>
14  
15   #ifdef _WIN32
16    #include <io.h>
17 +  #include <direct.h> /* getcwd(), chdir(), etc. */
18  
19    #define access _access
20    #define PATH_MAX _MAX_PATH
# Line 28 | Line 29 | extern "C" {
29    #define CASEDIRSEP    case '/': case '\\'
30    #define PATHSEP               ';'
31    #define CURDIR                '.'
31 –  /*#define MAXPATH             512*/ /* obsoleted by posix PATH_MAX */
32    #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
33    #define TEMPLATE      "rtXXXXXX"
34    #define TEMPLEN               8
# Line 43 | Line 43 | extern "C" {
43      #define  W_OK 02
44      #define  R_OK 04
45    #endif
46 < extern char  *fixargv0();
46 >  /* to make the permissions user specific we'd need to use CreateFile() */
47 >  #ifndef S_IRUSR
48 >    #define S_IRUSR _S_IREAD
49 >    #define S_IWUSR _S_IWRITE
50 >  #endif
51  
52 +  #ifdef __cplusplus
53 +    extern "C" {
54 +  #endif
55 +  extern char  *fixargv0();
56 +  #ifdef __cplusplus
57 +    }
58 +  #endif
59 +
60   #else /* everything but Windows */
61    #include <unistd.h>
62    #include <sys/param.h>
# Line 63 | Line 75 | extern char  *fixargv0();
75      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
76      #define PATHSEP             ';'
77          #define CURDIR          '.'
66 –    /*#define MAXPATH           128*/ /* obsoleted by posix PATH_MAX */
78      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
79      #define TEMPLATE    "/tmp/rtXXXXXX"
80      #define TEMPLEN             13
# Line 83 | Line 94 | extern char  *fixargv0();
94      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
95      #define PATHSEP             ':'
96          #define CURDIR          '.'
86 –    /*#define MAXPATH           256*/ /* obsoleted by posix PATH_MAX */
97      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
98      #define TEMPLATE    "/usr/tmp/rtXXXXXX"
99      #define TEMPLEN             17
# Line 103 | Line 113 | extern char  *fixargv0();
113    #define CASEDIRSEP    case DIRSEP
114   #endif
115  
116 + #ifdef __cplusplus
117 + extern "C" {
118 + #endif
119  
120   /* Find a writeable directory for temporary files */
121   /* If s is NULL, we return a static string */

Diff Legend

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