--- ray/src/common/paths.h	2016/02/03 22:41:35	2.26
+++ ray/src/common/paths.h	2016/03/06 01:13:17	2.27
@@ -1,4 +1,4 @@
-/* RCSid $Id: paths.h,v 2.26 2016/02/03 22:41:35 greg Exp $ */
+/* RCSid $Id: paths.h,v 2.27 2016/03/06 01:13:17 schorsch Exp $ */
 /*
  * Definitions for paths on different machines
  */
@@ -12,9 +12,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifdef _WIN32
+#if defined(_WIN32) || defined(_WIN64)
   #include <io.h>
   #include <direct.h> /* getcwd(), chdir(), _mkdir(), etc. */
+  #define getcwd _getcwd
+  #define chdir _chdir
 
   #define access		_access
   #define mkdir(dirname,perms)	_mkdir(dirname)
@@ -125,7 +127,7 @@
 extern "C" {
 #endif
 
-#if _WIN32
+#if defined(_WIN32) || defined(_WIN64)
   extern FILE *win_popen(char *command, char *type);
   extern int win_pclose(FILE *p);
   extern char  *fixargv0();