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.22 by schorsch, Mon Sep 19 11:30:10 2005 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(), _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 \
# Line 28 | Line 31 | extern "C" {
31    #define CASEDIRSEP    case '/': case '\\'
32    #define PATHSEP               ';'
33    #define CURDIR                '.'
31  /*#define MAXPATH             512*/ /* obsoleted by posix PATH_MAX */
34    #define DEFAULT_TEMPDIRS {"C:/TMP", "C:/TEMP", ".", NULL}
35    #define TEMPLATE      "rtXXXXXX"
36    #define TEMPLEN               8
# Line 43 | Line 45 | extern "C" {
45      #define  W_OK 02
46      #define  R_OK 04
47    #endif
48 < extern char  *fixargv0();
48 >  /* to make the permissions user specific we'd need to use CreateFile() */
49 >  #ifndef S_IRUSR
50 >    #define S_IRUSR _S_IREAD
51 >    #define S_IWUSR _S_IWRITE
52 >  #endif
53  
54 +  #ifdef __cplusplus
55 +    extern "C" {
56 +  #endif
57 +  extern char  *fixargv0();
58 +  #ifdef __cplusplus
59 +    }
60 +  #endif
61 +
62   #else /* everything but Windows */
63    #include <unistd.h>
64    #include <sys/param.h>
# Line 59 | Line 73 | extern char  *fixargv0();
73  
74    #ifdef AMIGA
75  
76 +        #define NULL_DEVICE     "NIL:"
77      #define DIRSEP              '/'
78      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
79      #define PATHSEP             ';'
80          #define CURDIR          '.'
66    /*#define MAXPATH           128*/ /* obsoleted by posix PATH_MAX */
81      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
82      #define TEMPLATE    "/tmp/rtXXXXXX"
83      #define TEMPLEN             13
# Line 83 | Line 97 | extern char  *fixargv0();
97      #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
98      #define PATHSEP             ':'
99          #define CURDIR          '.'
86    /*#define MAXPATH           256*/ /* obsoleted by posix PATH_MAX */
100      #define DEFAULT_TEMPDIRS {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
101 <    #define TEMPLATE    "/usr/tmp/rtXXXXXX"
101 >    #define TEMPLATE    "/tmp/rtXXXXXX"
102      #define TEMPLEN             17
103      #define ULIBVAR             "RAYPATH"
104      #ifndef DEFPATH
# Line 103 | Line 116 | extern char  *fixargv0();
116    #define CASEDIRSEP    case DIRSEP
117   #endif
118  
119 + #ifdef __cplusplus
120 + extern "C" {
121 + #endif
122  
123   /* Find a writeable directory for temporary files */
124   /* If s is NULL, we return a static string */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines