Mercurial > hg > xemacs-beta
diff src/sysfile.h @ 4736:d261888e5069
Fix Win32 native build after my DEFAULT_DIRECTORY_FALLBACK change, thanks Vin!
src/ChangeLog addition:
2009-11-09 Aidan Kehoe <kehoea@parhasard.net>
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
Move the WIN32_NATIVE definition inside the #ifdef emacs
conditional, clear up the comment after #else; thanks for the
build failure report, Vin!
Cast DEFAULT_DIRECTORY_FALLBACK to (const CIbyte *) by default,
which better reflects its contents.
* editfns.c (get_home_directory):
* buffer.c (init_initial_directory):
Cast DEFAULT_DIRECTORY_FALLBACK to (Ibyte *) with functions that
take that type, now that is necessary.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 09 Nov 2009 18:00:10 +0000 |
| parents | a5210e70ffbe |
| children | aa5ed11f473b |
line wrap: on
line diff
--- a/src/sysfile.h Mon Nov 09 09:21:59 2009 -0700 +++ b/src/sysfile.h Mon Nov 09 18:00:10 2009 +0000 @@ -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 */