[COMMIT] Eliminate some Windows build errors that also happen with -pedantic

Aidan Kehoe kehoea at parhasard.net
Sat Aug 5 04:40:14 EDT 2006


 Ar an ceathrú lá de mí Lúnasa, scríobh Vin Shelton: 

 > Aidan,
 > 
 > I'm guessing it was one of your submissions that caused this failure:

Indeed. I need to look into building with -pedantic by default, or looking
up the MSVC argument to disable that error.

APPROVE COMMIT

NOTE: This patch has been committed.

src/ChangeLog addition:

2006-08-05  Aidan Kehoe  <kehoea at parhasard.net>

	* syntax.c (complex_vars_of_syntax):
	String literals are char[], not unsigned char[]. Cast them when
	passing to a function that takes UExtbyte *. 
	

XEmacs Trunk source patch:
Diff command:   cvs -q diff -Nu
Files affected: src/syntax.c

Index: src/syntax.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/syntax.c,v
retrieving revision 1.29
diff -u -u -r1.29 syntax.c
--- src/syntax.c	2006/08/04 20:01:14	1.29
+++ src/syntax.c	2006/08/05 08:27:26
@@ -2490,18 +2490,20 @@
   /* Control 0; treat as punctuation */
   SET_RANGE_SYNTAX(0, 32, Spunct);
 
-  /* The whitespace--overwriting some of the above changes. */
-  define_standard_syntax(" \t\015\014", Swhitespace);
+  /* The whitespace--overwriting some of the above changes.
 
+     String literals are const char *s, not const unsigned char *s. */
+  define_standard_syntax((const UExtbyte *)" \t\015\014", Swhitespace);
+
   /* DEL plus Control 1 */
   SET_RANGE_SYNTAX(127, 159, Spunct);
 
-  define_standard_syntax ("\"", Sstring);
-  define_standard_syntax ("\\", Sescape);
-  define_standard_syntax ("_-+*/&|<>=", Ssymbol);
-  define_standard_syntax (".,;:?!#@~^'`", Spunct);
+  define_standard_syntax ((const UExtbyte *)"\"", Sstring);
+  define_standard_syntax ((const UExtbyte *)"\\", Sescape);
+  define_standard_syntax ((const UExtbyte *)"_-+*/&|<>=", Ssymbol);
+  define_standard_syntax ((const UExtbyte *)".,;:?!#@~^'`", Spunct);
 
-  for (p = "()[]{}"; *p; p+=2)
+  for (p = (const UExtbyte *)"()[]{}"; *p; p+=2)
     {
       Fput_char_table (make_char (p[0]),
 		       Fcons (make_int (Sopen), make_char (p[1])),
@@ -2517,11 +2519,11 @@
 
   /* The guillemets. These are not parentheses, in contrast to what the old
      code did. */
-  define_standard_syntax("\253\273", Sstring);
+  define_standard_syntax((const UExtbyte *)"\253\273", Sstring);
 
   /* The inverted exclamation mark, and the multiplication and division
      signs. */
-  define_standard_syntax("\241\327\367", Spunct);
+  define_standard_syntax((const UExtbyte *)"\241\327\367", Spunct);
 
 #undef SET_RANGE_SYNTAX  
 }

-- 
Santa Maradona, priez pour moi!




More information about the XEmacs-Beta mailing list