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.25 by greg, Tue Feb 2 18:02:32 2016 UTC vs.
Revision 2.31 by greg, Fri Apr 7 19:06:18 2023 UTC

# Line 12 | Line 12
12   #include <sys/types.h>
13   #include <sys/stat.h>
14  
15 < #ifdef _WIN32
15 > #if defined(_WIN32) || defined(_WIN64)
16    #include <io.h>
17    #include <direct.h> /* getcwd(), chdir(), _mkdir(), etc. */
18 +  #define getcwd _getcwd
19 +  #define chdir _chdir
20  
21    #define access                _access
22    #define mkdir(dirname,perms)  _mkdir(dirname)
23 <  #ifdef _MSC_VER
23 >  /* The windows _popen with the native shell breaks '\\\n' escapes.
24 >   * RT_WINPROC (used by SCons) enables our replacement functions to fix that.
25 >   * XXX This should really not depend on the compiler used! */
26 >  #if 1 /* defined(_MSC_VER) && !defined(RT_WINPROC) */
27      #define popen(cmd,mode)     _popen(cmd,mode)
28      #define pclose(p)           _pclose(p)
29    #else
# Line 27 | Line 32
32    #endif
33    #define kill(pid,sig)         win_kill(pid,sig)
34    #define nice(inc)             win_nice(inc)
35 <  #define PATH_                 MAX _MAX_PATH
35 >  #define PATH_MAX              _MAX_PATH
36    #define NULL_DEVICE           "NUL"
37    #define DIRSEP                '/'
38    #define ISDIRSEP(c)           (((c)=='/') | ((c)=='\\'))
# Line 101 | Line 106
106          #define CURDIR          '.'
107      #define DEFAULT_TEMPDIRS    {"/var/tmp", "/usr/tmp", "/tmp", ".", NULL}
108      #define TEMPLATE            "/tmp/rtXXXXXX"
109 <    #define TEMPLEN             17
109 >    #define TEMPLEN             13
110      #define ULIBVAR             "RAYPATH"
111      #ifndef DEFPATH
112        #define DEFPATH           ":/usr/local/lib/ray"
# Line 125 | Line 130
130   extern "C" {
131   #endif
132  
133 < #if _WIN32
133 > #if defined(_WIN32) || defined(_WIN64)
134    extern FILE *win_popen(char *command, char *type);
135    extern int win_pclose(FILE *p);
136 <  extern int win_kill(RT_PID pid, int sig /* ignored */);
132 <  extern char  *fixargv0();
136 >  extern char  *fixargv0(char *arg0);
137   #endif
138  
139   /* Check if any of the characters in str2 are found in str1 */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines