--- ray/src/common/paths.h	1992/12/09 12:59:45	2.5
+++ ray/src/common/paths.h	2003/06/05 19:29:34	2.11
@@ -1,20 +1,19 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: paths.h,v 2.11 2003/06/05 19:29:34 schorsch Exp $ */
 /*
  * Definitions for paths on different machines
  */
 
-#ifdef MSDOS
+#include "copyright.h"
 
+#ifdef _WIN32
+
 #define DIRSEP		'/'
 #define ISDIRSEP(c)	((c)=='/' || (c)=='\\')
 #define CASEDIRSEP	case '/': case '\\'
 #define PATHSEP		';'
 #define MAXPATH		128
-#define TEMPLATE	"c:\\tmp\\rtXXXXXX"
-#define TEMPLEN		15
+#define TEMPLATE	"rtXXXXXX"
+#define TEMPLEN		8
 #define ULIBVAR		"RAYPATH"
 #ifndef DEFPATH
 #define DEFPATH		";c:/ray/lib"
@@ -41,7 +40,7 @@ extern char  *fixargv0();
 #define PATHSEP		':'
 #define MAXPATH		256
 #define TEMPLATE	"/usr/tmp/rtXXXXXX"
-#define TEMPLEN		13
+#define TEMPLEN		17
 #define ULIBVAR		"RAYPATH"
 #ifndef DEFPATH
 #define DEFPATH		":/usr/local/lib/ray"
@@ -59,3 +58,10 @@ extern char  *fixargv0();
 #endif
 
 extern char  *mktemp(), *getenv();
+
+#ifdef BSD
+extern char  *getwd();
+#else
+extern char  *getcwd();
+#define  getwd(p)	getcwd(p, sizeof(p))
+#endif