--- a/src/symeval.h	Wed Jan 20 07:05:57 2010 -0600
+++ b/src/symeval.h	Wed Feb 24 01:58:04 2010 -0600
@@ -326,16 +326,16 @@
 #endif /* not NEW_GC */
 
 MODULE_API void defsymbol_massage_name (Lisp_Object *location,
-					const char *name);
+					const Ascbyte *name);
 MODULE_API void defsymbol_massage_name_nodump (Lisp_Object *location,
-					       const char *name);
+					       const Ascbyte *name);
 MODULE_API void defsymbol_massage_multiword_predicate (Lisp_Object *location,
-						       const char *name);
+						       const Ascbyte *name);
 MODULE_API void
 defsymbol_massage_multiword_predicate_nodump (Lisp_Object *location,
-					      const char *name);
-MODULE_API void defsymbol (Lisp_Object *location, const char *name);
-MODULE_API void defsymbol_nodump (Lisp_Object *location, const char *name);
+					      const Ascbyte *name);
+MODULE_API void defsymbol (Lisp_Object *location, const Ascbyte *name);
+MODULE_API void defsymbol_nodump (Lisp_Object *location, const Ascbyte *name);
 
 /* Defining symbols:
 
@@ -370,18 +370,18 @@
 #define DEFSYMBOL_MULTIWORD_PREDICATE_NO_DUMP(name) \
   defsymbol_massage_multiword_predicate_nodump (&name, #name)
 
-MODULE_API void defkeyword (Lisp_Object *location, const char *name);
+MODULE_API void defkeyword (Lisp_Object *location, const Ascbyte *name);
 MODULE_API void defkeyword_massage_name (Lisp_Object *location,
-					 const char *name);
+					 const Ascbyte *name);
 #define DEFKEYWORD(name) defkeyword_massage_name (&name, #name)
 
-MODULE_API void deferror (Lisp_Object *symbol, const char *name,
-			  const char *message, Lisp_Object inherits_from);
-MODULE_API void deferror_massage_name (Lisp_Object *symbol, const char *name,
-				       const char *message,
+MODULE_API void deferror (Lisp_Object *symbol, const Ascbyte *name,
+			  const Ascbyte *message, Lisp_Object inherits_from);
+MODULE_API void deferror_massage_name (Lisp_Object *symbol, const Ascbyte *name,
+				       const Ascbyte *message,
 				       Lisp_Object inherits_from);
 MODULE_API void deferror_massage_name_and_message (Lisp_Object *symbol,
-						   const char *name,
+						   const Ascbyte *name,
 						   Lisp_Object inherits_from);
 #define DEFERROR(name, message, inherits_from) \
   deferror_massage_name (&name, #name, message, inherits_from)
@@ -393,7 +393,7 @@
 /* Macros we use to define forwarded Lisp variables.
    These are used in the syms_of_FILENAME functions.  */
 
-MODULE_API void defvar_magic (const char *symbol_name,
+MODULE_API void defvar_magic (const Ascbyte *symbol_name,
 			      const struct symbol_value_forward *magic);
 
 #ifdef NEW_GC
@@ -459,7 +459,7 @@
   DEFVAR_SYMVAL_FWD (lname, c_location, forward_type, magicfun);	    \
   {									    \
     Lisp_Object *DSF_location = c_location; /* Type check */		    \
-    staticpro (DSF_location);						    \
+    staticpro_1 (DSF_location, lname);					    \
     if (EQ (*DSF_location, Qnull_pointer)) *DSF_location = Qnil;	    \
   }									    \
 } while (0)