Mercurial > hg > xemacs-beta
changeset 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 | 80d74fed5399 |
| children | dce479915b74 |
| files | src/ChangeLog src/buffer.c src/editfns.c src/sysfile.h |
| diffstat | 4 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Nov 09 09:21:59 2009 -0700 +++ b/src/ChangeLog Mon Nov 09 18:00:10 2009 +0000 @@ -1,3 +1,16 @@ +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. + 2009-11-09 Jerry James <james@xemacs.org> * Makefile.in.in: Remove support for malloc.c ("old" GNU malloc). Do
--- a/src/buffer.c Mon Nov 09 09:21:59 2009 -0700 +++ b/src/buffer.c Mon Nov 09 18:00:10 2009 +0000 @@ -2929,7 +2929,7 @@ stderr_out ("`getcwd' failed: %s: changing default directory to %s\n", errmess, DEFAULT_DIRECTORY_FALLBACK); - if (qxe_chdir (DEFAULT_DIRECTORY_FALLBACK) < 0) + if (qxe_chdir ((Ibyte *)DEFAULT_DIRECTORY_FALLBACK) < 0) { GET_STRERROR (errmess, errno);
--- a/src/editfns.c Mon Nov 09 09:21:59 2009 -0700 +++ b/src/editfns.c Mon Nov 09 18:00:10 2009 +0000 @@ -868,7 +868,8 @@ Using "/" isn't quite right, but what should we do? We probably should try to extract pw_dir from /etc/passwd, before falling back to this. */ - cached_home_directory = qxestrdup (DEFAULT_DIRECTORY_FALLBACK); + cached_home_directory + = qxestrdup ((const Ibyte *)DEFAULT_DIRECTORY_FALLBACK); output_home_warning = 1; } }
--- 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 */