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.17 by schorsch, Thu Jul 3 22:41:44 2003 UTC vs.
Revision 2.20 by schorsch, Tue Oct 21 19:19:28 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>
# Line 17 | Line 14 | extern "C" {
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
21 +  #define NULL_DEVICE   "NUL"
22    #define DIRSEP                '/'
23    #define ISDIRSEP(c)   ((c)=='/' || (c)=='\\')
24    #define ISABS(s)      ((s)!=NULL \
# Line 50 | Line 49 | extern "C" {
49      #define S_IRUSR _S_IREAD
50      #define S_IWUSR _S_IWRITE
51    #endif
53 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 66 | 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 108 | 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
> Changed lines