* coop-defs.h: fix various preprocessor usages of new public

[bpt/guile.git] / libguile / variable.c

diff --git a/libguile/variable.c b/libguile/variable.c
index b0e9b61..0369a28 100644 (file)
--- a/libguile/variable.c
+++ b/libguile/variable.c
@@ -68,12 +68,7 @@ scm_i_variable_print (SCM exp, SCM port, scm_print_state *pstate)
 static SCM
 make_variable (SCM init)
 {
-  SCM z;
-  SCM_NEWCELL (z);
-  SCM_SET_CELL_WORD_1 (z, SCM_UNPACK (init));
-  SCM_SET_CELL_TYPE (z, scm_tc7_variable);
-  scm_remember_upto_here_1 (init);
-  return z;
+  return scm_cell (scm_tc7_variable, SCM_UNPACK (init));
 }
 
 SCM_DEFINE (scm_make_variable, "make-variable", 1, 0, 0, 
@@ -151,9 +146,7 @@ SCM_DEFINE (scm_variable_bound_p, "variable-bound?", 1, 0, 0,
 void
 scm_init_variable ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/variable.x"
-#endif
 }
 
 /*