carbon2-commit: Pass READ_BINARY to scan_lisp_file, scan_c_file in make-docfile.c

Aidan Kehoe aidan-guest at alioth.debian.org
Sat May 24 03:57:21 EDT 2008


changeset:   4482:c785f98c6737d0da7774c975790b6247717af226
user:        Aidan Kehoe <kehoea at parhasard.net>
date:        Tue May 13 20:08:28 2008 +0200
files:       lib-src/ChangeLog lib-src/make-docfile.c
description:
Pass READ_BINARY to scan_lisp_file, scan_c_file in make-docfile.c

2008-05-13  Aidan Kehoe  <kehoea at parhasard.net>

	* make-docfile.c (scan_file):
	Pass READ_BINARY to scan_lisp_file, scan_c_file; avoids an
	assertion failure with Visual C++ 2005 Express Edition, and is
	logically more coherent, given that our Lisp and C files are saved
	with Unix line endings.


diff -r 49f8ed0345005a02146572b11bdb55f0127d3bf2 -r c785f98c6737d0da7774c975790b6247717af226 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Mon May 12 11:53:04 2008 +0200
+++ b/lib-src/ChangeLog	Tue May 13 20:08:28 2008 +0200
@@ -1,3 +1,11 @@ 2007-08-27  Mike Sperber  <mike at xemacs.o
+2008-05-13  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* make-docfile.c (scan_file):
+	Pass READ_BINARY to scan_lisp_file, scan_c_file; avoids an
+	assertion failure with Visual C++ 2005 Express Edition, and is
+	logically more coherent, given that our Lisp and C files are saved
+	with Unix line endings. 
+
 2007-08-27  Mike Sperber  <mike at xemacs.org>
 
 	* config.values.in (datarootdir):  Add.
diff -r 49f8ed0345005a02146572b11bdb55f0127d3bf2 -r c785f98c6737d0da7774c975790b6247717af226 lib-src/make-docfile.c
--- a/lib-src/make-docfile.c	Mon May 12 11:53:04 2008 +0200
+++ b/lib-src/make-docfile.c	Tue May 13 20:08:28 2008 +0200
@@ -306,12 +306,12 @@ scan_file (const char *filename)
   else if (ellcc == 0 && len > 3 && !strcmp (filename + len - 3, ".el"))
     {
       Current_file_type = el_file;
-      return scan_lisp_file (filename, READ_TEXT);
+      return scan_lisp_file (filename, READ_BINARY);
     }
   else
     {
       Current_file_type = c_file;
-      return scan_c_file (filename, READ_TEXT);
+      return scan_c_file (filename, READ_BINARY);
     }
 }
 




More information about the XEmacs-Patches mailing list