# HG changeset patch
# User Ben Wing <ben@xemacs.org>
# Date 1265211049 21600
# Node ID ba353d7b0ce81939cc98ebf2e37bcc77409c3ab3
# Parent  8ee3c10d1ed56e5cbc16fb0960d1c4fbad311fa6
temporarily back out part of patch to avoid compile probs

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

src/ChangeLog addition:

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

	* symbols.c (defsymbol_massage_name_1):
	* symbols.c (defsymbol_nodump):
	* symbols.c (defsymbol):
	* symbols.c (defkeyword):
	* symeval.h (DEFVAR_SYMVAL_FWD_OBJECT):
	Temporarily back out staticpro-related changes in symbols.c and
	symeval.h to fix compile problems, will put back when `latest-fix'
	workspace gets merged in.

diff -r 8ee3c10d1ed5 -r ba353d7b0ce8 src/ChangeLog
--- a/src/ChangeLog	Wed Feb 03 08:50:00 2010 -0600
+++ b/src/ChangeLog	Wed Feb 03 09:30:49 2010 -0600
@@ -1,3 +1,14 @@
+2010-02-03  Ben Wing  <ben@xemacs.org>
+
+	* symbols.c (defsymbol_massage_name_1):
+	* symbols.c (defsymbol_nodump):
+	* symbols.c (defsymbol):
+	* symbols.c (defkeyword):
+	* symeval.h (DEFVAR_SYMVAL_FWD_OBJECT):
+	Temporarily back out staticpro-related changes in symbols.c and
+	symeval.h to fix compile problems, will put back when `latest-fix'
+	workspace gets merged in.
+
 2010-02-03  Ben Wing  <ben@xemacs.org>
 
 	* alloc.c (Fmake_byte_code):
diff -r 8ee3c10d1ed5 -r ba353d7b0ce8 src/symbols.c
--- a/src/symbols.c	Wed Feb 03 08:50:00 2010 -0600
+++ b/src/symbols.c	Wed Feb 03 09:30:49 2010 -0600
@@ -3562,9 +3562,9 @@
       temp[i] = '-';
   *location = Fintern (make_string ((const Ibyte *) temp, len), Qnil);
   if (dump_p)
-    staticpro_1 (location, name);
+    staticpro (location);
   else
-    staticpro_nodump_1 (location, name);
+    staticpro_nodump (location);
 }
 
 void
@@ -3598,7 +3598,7 @@
   *location = Fintern (make_string_nocopy ((const Ibyte *) name,
 					   strlen (name)),
 		       Qnil);
-  staticpro_nodump_1 (location, name);
+  staticpro_nodump (location);
 }
 
 void
@@ -3607,7 +3607,7 @@
   *location = Fintern (make_string_nocopy ((const Ibyte *) name,
 					   strlen (name)),
 		       Qnil);
-  staticpro_1 (location, name);
+  staticpro (location);
 }
 
 void
diff -r 8ee3c10d1ed5 -r ba353d7b0ce8 src/symeval.h
--- a/src/symeval.h	Wed Feb 03 08:50:00 2010 -0600
+++ b/src/symeval.h	Wed Feb 03 09:30:49 2010 -0600
@@ -460,7 +460,7 @@
   DEFVAR_SYMVAL_FWD (lname, c_location, forward_type, magicfun);	    \
   {									    \
     Lisp_Object *DSF_location = c_location; /* Type check */		    \
-    staticpro_1 (DSF_location, lname);					    \
+    staticpro (DSF_location);						    \
     if (EQ (*DSF_location, Qnull_pointer)) *DSF_location = Qnil;	    \
   }									    \
 } while (0)