--- ray/src/common/paths.h	2003/07/03 22:41:44	2.17
+++ ray/src/common/paths.h	2003/10/21 19:19:28	2.20
@@ -1,12 +1,9 @@
-/* RCSid $Id: paths.h,v 2.17 2003/07/03 22:41:44 schorsch Exp $ */
+/* RCSid $Id: paths.h,v 2.20 2003/10/21 19:19:28 schorsch Exp $ */
 /*
  * Definitions for paths on different machines
  */
 #ifndef _RAD_PATHS_H_
 #define _RAD_PATHS_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -17,9 +14,11 @@ extern "C" {
 
 #ifdef _WIN32
   #include <io.h>
+  #include <direct.h> /* getcwd(), chdir(), etc. */
 
   #define access _access
   #define PATH_MAX _MAX_PATH
+  #define NULL_DEVICE	"NUL"
   #define DIRSEP		'/'
   #define ISDIRSEP(c)	((c)=='/' || (c)=='\\')
   #define ISABS(s)	((s)!=NULL \
@@ -50,8 +49,15 @@ extern "C" {
     #define S_IRUSR _S_IREAD
     #define S_IWUSR _S_IWRITE
   #endif
-extern char  *fixargv0();
 
+  #ifdef __cplusplus
+    extern "C" {
+  #endif
+  extern char  *fixargv0();
+  #ifdef __cplusplus
+    }
+  #endif
+
 #else /* everything but Windows */
   #include <unistd.h>
   #include <sys/param.h>
@@ -66,6 +72,7 @@ extern char  *fixargv0();
 
   #ifdef AMIGA
 
+	#define NULL_DEVICE	"NIL:"
     #define DIRSEP		'/'
     #define ISABS(s) ((s)!=NULL && (ISDIRSEP(s[0])))
     #define PATHSEP		';'
@@ -108,6 +115,9 @@ extern char  *fixargv0();
   #define CASEDIRSEP	case DIRSEP
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* Find a writeable directory for temporary files */
 /* If s is NULL, we return a static string */