diff src/sysfile.h @ 4740:ff037e1dc33c

automatic merge
author Stephen J. Turnbull <stephen@xemacs.org>
date Thu, 12 Nov 2009 00:00:11 +0900
parents d261888e5069
children aa5ed11f473b
line wrap: on
line diff
--- a/src/sysfile.h	Wed Nov 11 23:52:58 2009 +0900
+++ b/src/sysfile.h	Thu Nov 12 00:00:11 2009 +0900
@@ -485,13 +485,13 @@
 }
 #define DIRECTORY_SEP sysfile_get_directory_sep()
 
-#else /* emacs */
+#define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"C:\\")
+
+#else /* not emacs */
 
 /* The above Lisp variables are not available to make-docfile, etc. */
 #define DIRECTORY_SEP DEFAULT_DIRECTORY_SEP
 
-#define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"C:\\")
-
 #endif /* emacs */
 
 #else /* not WIN32_NATIVE */
@@ -499,7 +499,7 @@
 #define SEPCHAR ':'
 #define DEFAULT_DIRECTORY_SEP '/'
 #define DIRECTORY_SEP '/'
-#define DEFAULT_DIRECTORY_FALLBACK ((Ibyte *)"/")
+#define DEFAULT_DIRECTORY_FALLBACK ((const CIbyte *)"/")
 
 #endif /* WIN32_NATIVE */