carbon2-commit: Provide SHEBANG_PROGNAME on Win32; correct a bug with it and string concat'ing

changeset: 4484:d9b9b5f903863b3ac33713441ea9c91e2553f144 user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Tue May 13 20:16:53 2008 +0200 files: nt/ChangeLog nt/xemacs.mak src/ChangeLog src/emacs.c description: Provide SHEBANG_PROGNAME on Win32; correct a bug with it and string concat'ing nt/ChangeLog addition: 2008-05-13 Aidan Kehoe <kehoea(a)parhasard.net&gt; * xemacs.mak (PROGRAM_DEFINES): Provide SHEBANG_PROGNAME on Win32 too. src/ChangeLog addition: 2008-05-13 Aidan Kehoe <kehoea(a)parhasard.net&gt; * emacs.c (SHEBANG_EXE_PROGNAME_LENGTH): Use WEXTSTRING separately on the two concatenated strings, avoiding an error on Win32. diff -r 2fddd822ce87c676cc23043237fdfa35cfd886ac -r d9b9b5f903863b3ac33713441ea9c91e2553f144 nt/ChangeLog --- 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-01-25 Michael Sperber <mike＠xemac +2008-05-13 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * xemacs.mak (PROGRAM_DEFINES): + Provide SHEBANG_PROGNAME on Win32 too. + 2008-01-25 Michael Sperber <mike(a)xemacs.org&gt; * xemacs.mak (version.sh): Generate version.sh via Mercurial. diff -r 2fddd822ce87c676cc23043237fdfa35cfd886ac -r d9b9b5f903863b3ac33713441ea9c91e2553f144 nt/xemacs.mak --- 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 ＠＠ PROGRAM_DEFINES=-DINFODOCK \ -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 ＠＠ PROGRAM_DEFINES= \ -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. diff -r 2fddd822ce87c676cc23043237fdfa35cfd886ac -r d9b9b5f903863b3ac33713441ea9c91e2553f144 src/ChangeLog --- 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＠parhasa +2008-05-13 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * 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(a)parhasard.net&gt; * config.h.in (_CRT_NONSTDC_NO_DEPRECATE): diff -r 2fddd822ce87c676cc23043237fdfa35cfd886ac -r d9b9b5f903863b3ac33713441ea9c91e2553f144 src/emacs.c --- 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 ＠＠ main_1 (int argc, Wexttext **argv, Wextt #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 (""))) { _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches