Mercurial > hg > xemacs-beta
changeset 4458:d9b9b5f90386
Provide SHEBANG_PROGNAME on Win32; correct a bug with it and string concat'ing
nt/ChangeLog addition:
2008-05-13 Aidan Kehoe <kehoea@parhasard.net>
* xemacs.mak (PROGRAM_DEFINES):
Provide SHEBANG_PROGNAME on Win32 too.
src/ChangeLog addition:
2008-05-13 Aidan Kehoe <kehoea@parhasard.net>
* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
Use WEXTSTRING separately on the two concatenated strings,
avoiding an error on Win32.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Tue, 13 May 2008 20:16:53 +0200 |
| parents | 2fddd822ce87 |
| children | 554b9d31e7a5 790bd95b84c1 |
| files | nt/ChangeLog nt/xemacs.mak src/ChangeLog src/emacs.c |
| diffstat | 4 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/nt/ChangeLog Tue May 13 20:11:51 2008 +0200 +++ b/nt/ChangeLog Tue May 13 20:16:53 2008 +0200 @@ -1,3 +1,8 @@ +2008-05-13 Aidan Kehoe <kehoea@parhasard.net> + + * xemacs.mak (PROGRAM_DEFINES): + Provide SHEBANG_PROGNAME on Win32 too. + 2008-01-25 Michael Sperber <mike@xemacs.org> * xemacs.mak (version.sh): Generate version.sh via Mercurial.
--- a/nt/xemacs.mak Tue May 13 20:11:51 2008 +0200 +++ b/nt/xemacs.mak Tue May 13 20:16:53 2008 +0200 @@ -427,6 +427,7 @@ -DPATH_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ -DPATH_PROGNAME=\"infodock\" \ -DEMACS_PROGNAME=\"infodock\" \ + -DSHEBANG_PROGNAME=\"infodock-script\" \ -DEMACS_VERSION=\"$(INFODOCK_VERSION_STRING)\" \ -DINFODOCK_MAJOR_VERSION=$(infodock_major_version) \ -DINFODOCK_MINOR_VERSION=$(infodock_minor_version) \ @@ -444,7 +445,7 @@ -DPATH_VERSION=\"$(XEMACS_VERSION_STRING)\" \ -DPATH_PROGNAME=\"xemacs\" \ -DEMACS_VERSION=\"$(XEMACS_VERSION_STRING)\" \ - -DEMACS_PROGNAME=\"xemacs\" + -DEMACS_PROGNAME=\"xemacs\" -DSHEBANG_PROGNAME=\"xemacs-script\" !endif ########################### Set up installation and package directories.
--- a/src/ChangeLog Tue May 13 20:11:51 2008 +0200 +++ b/src/ChangeLog Tue May 13 20:16:53 2008 +0200 @@ -1,3 +1,9 @@ +2008-05-13 Aidan Kehoe <kehoea@parhasard.net> + + * emacs.c (SHEBANG_EXE_PROGNAME_LENGTH): + Use WEXTSTRING separately on the two concatenated strings, + avoiding an error on Win32. + 2008-05-13 Aidan Kehoe <kehoea@parhasard.net> * config.h.in (_CRT_NONSTDC_NO_DEPRECATE):
--- a/src/emacs.c Tue May 13 20:11:51 2008 +0200 +++ b/src/emacs.c Tue May 13 20:16:53 2008 +0200 @@ -958,7 +958,7 @@ #define SHEBANG_PROGNAME_LENGTH \ (int)((sizeof (WEXTSTRING (SHEBANG_PROGNAME)) - sizeof (WEXTSTRING ("")))) #define SHEBANG_EXE_PROGNAME_LENGTH \ - (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME ".exe")) \ + (int)(sizeof (WEXTSTRING (SHEBANG_PROGNAME) WEXTSTRING(".exe")) \ - sizeof (WEXTSTRING (""))) {