ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.27 by schorsch, Sun Mar 6 01:13:17 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)
# Line 27 | Line 29
29    #endif
30    #define kill(pid,sig)         win_kill(pid,sig)
31    #define nice(inc)             win_nice(inc)
32 <  #define PATH_                 MAX _MAX_PATH
32 >  #define PATH_MAX              _MAX_PATH
33    #define NULL_DEVICE           "NUL"
34    #define DIRSEP                '/'
35    #define ISDIRSEP(c)           (((c)=='/') | ((c)=='\\'))
# Line 125 | Line 127
127   extern "C" {
128   #endif
129  
130 < #if _WIN32
130 > #if defined(_WIN32) || defined(_WIN64)
131    extern FILE *win_popen(char *command, char *type);
132    extern int win_pclose(FILE *p);
131 –  extern int win_kill(RT_PID pid, int sig /* ignored */);
133    extern char  *fixargv0();
134   #endif
135  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)