# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1265329659 21600
# Node ID 3bf1b0f0c39163f7ab6a22165d91528b8d7900de
# Parent  c448f4c38d65b2db42031316347a97e0402be726
fix compile errors

-------------------- ChangeLog entries follow: --------------------

src/ChangeLog addition:

2010-02-04  Ben Wing  <ben@xemacs.org>

	* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
	* emacs.c (main_1):
	Restore old definition of SHEBANG_EXE_PROGNAME_LENGTH; not possible
	to ANSI-concatenate wide and narrow strings.
	* print.c (write_msg_istring):
	* print.c (write_msg_cistring):
	* print.c (write_msg_ascstring):
	Can't return a value in a void-declared function.

diff -r c448f4c38d65 -r 3bf1b0f0c391 src/ChangeLog
--- a/src/ChangeLog	Thu Feb 04 05:58:40 2010 -0600
+++ b/src/ChangeLog	Thu Feb 04 18:27:39 2010 -0600
@@ -1,3 +1,14 @@
+2010-02-04  Ben Wing  <ben@xemacs.org>
+
+	* emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
+	* emacs.c (main_1):
+	Restore old definition of SHEBANG_EXE_PROGNAME_LENGTH; not possible
+	to ANSI-concatenate wide and narrow strings.
+	* print.c (write_msg_istring):
+	* print.c (write_msg_cistring):
+	* print.c (write_msg_ascstring):
+	Can't return a value in a void-declared function.
+
 2010-02-04  Ben Wing  <ben@xemacs.org>
 
 	* filelock.c:
diff -r c448f4c38d65 -r 3bf1b0f0c391 src/emacs.c
--- a/src/emacs.c	Thu Feb 04 05:58:40 2010 -0600
+++ b/src/emacs.c	Thu Feb 04 18:27:39 2010 -0600
@@ -937,7 +937,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 ("")))
 
   {
diff -r c448f4c38d65 -r 3bf1b0f0c391 src/print.c
--- a/src/print.c	Thu Feb 04 05:58:40 2010 -0600
+++ b/src/print.c	Thu Feb 04 18:27:39 2010 -0600
@@ -680,14 +680,14 @@
 write_msg_istring (Lisp_Object stream, const Ibyte *str)
 {
   /* This function can GC */
-  return write_istring (stream, IGETTEXT (str));
+  write_istring (stream, IGETTEXT (str));
 }
 
 void
 write_msg_cistring (Lisp_Object stream, const CIbyte *str)
 {
   /* This function can GC */
-  return write_msg_istring (stream, (const Ibyte *) str);
+  write_msg_istring (stream, (const Ibyte *) str);
 }
 
 void
@@ -695,7 +695,7 @@
 {
   /* This function can GC */
   ASSERT_ASCTEXT_ASCII (str);
-  return write_msg_istring (stream, (const Ibyte *) str);
+  write_msg_istring (stream, (const Ibyte *) str);
 }
 
 void