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.26 by greg, Wed Feb 3 22:41:35 2016 UTC vs.
Revision 2.28 by schorsch, Mon Mar 7 01:15:01 2016 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 defined(_MSC_VER) && !defined(RT_WINPROC)
27      #define popen(cmd,mode)     _popen(cmd,mode)
28      #define pclose(p)           _pclose(p)
29    #else
# 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 char  *fixargv0();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines