--- ray/src/common/paths.h	2003/07/14 20:02:29	2.18
+++ ray/src/common/paths.h	2003/07/14 22:23:59	2.19
@@ -1,12 +1,9 @@
-/* RCSid $Id: paths.h,v 2.18 2003/07/14 20:02:29 schorsch Exp $ */
+/* RCSid $Id: paths.h,v 2.19 2003/07/14 22:23:59 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>
@@ -51,8 +48,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>
@@ -109,6 +113,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 */