Retire inclusion guard macro SCM_MAGIC_SNARFER.

2025-05-02 21:10:27 +02:00 · 2002-03-14 05:26:16 +00:00 · 2002-03-14 05:26:16 +00:00 · 79401766de
commit 79401766de
parent f547334d00
81 changed files with 0 additions and 162 deletions
--- a/libguile/alist.c
+++ b/libguile/alist.c
@ -403,9 +403,7 @@ SCM_DEFINE (scm_assoc_remove_x, "assoc-remove!", 2, 0, 0,
 void
 scm_init_alist ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/alist.x"
-#endif
 }


--- a/libguile/arbiters.c
+++ b/libguile/arbiters.c
@ -129,9 +129,7 @@ scm_init_arbiters ()
  scm_tc16_arbiter = scm_make_smob_type ("arbiter", 0);
  scm_set_smob_mark (scm_tc16_arbiter, scm_markcdr);
  scm_set_smob_print (scm_tc16_arbiter, arbiter_print);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/arbiters.x"
-#endif
 }

 /*
--- a/libguile/async.c
+++ b/libguile/async.c
@ -456,9 +456,7 @@ scm_init_async ()
  tc16_async = scm_make_smob_type ("async", 0);
  scm_set_smob_mark (tc16_async, async_mark);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/async.x"
-#endif
 }

 /*
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@ -773,9 +773,7 @@ scm_init_backtrace ()
  SCM f = scm_make_fluid ();
  scm_the_last_stack_fluid_var = scm_c_define ("the-last-stack", f);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/backtrace.x"
-#endif
 }

 /*
--- a/libguile/boolean.c
+++ b/libguile/boolean.c
@ -73,9 +73,7 @@ SCM_DEFINE (scm_boolean_p, "boolean?", 1, 0, 0,
 void
 scm_init_boolean ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/boolean.x"
-#endif
 }


--- a/libguile/chars.c
+++ b/libguile/chars.c
@ -404,9 +404,7 @@ int scm_n_charnames = sizeof (scm_charnames) / sizeof (char *);
 void
 scm_init_chars ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/chars.x"
-#endif
 }


--- a/libguile/continuations.c
+++ b/libguile/continuations.c
@ -304,9 +304,7 @@ scm_init_continuations ()
  scm_set_smob_free (scm_tc16_continuation, continuation_free);
  scm_set_smob_print (scm_tc16_continuation, continuation_print);
  scm_set_smob_apply (scm_tc16_continuation, continuation_apply, 0, 0, 1);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/continuations.x"
-#endif
 }

 /*
--- a/libguile/debug-malloc.c
+++ b/libguile/debug-malloc.c
@ -254,8 +254,6 @@ scm_debug_malloc_prehistory ()
 void
 scm_init_debug_malloc ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/debug-malloc.x"
-#endif
 }

--- a/libguile/debug.c
+++ b/libguile/debug.c
@ -637,9 +637,7 @@ scm_init_debug ()
 #endif
  scm_add_feature ("debug-extensions");

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/debug.x"
-#endif
 }

 /*
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@ -149,9 +149,7 @@ scm_init_deprecation ()
      atexit (print_deprecation_summary);
    }
 #endif
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/deprecation.x"
-#endif
 }

 /*
--- a/libguile/dynl.c
+++ b/libguile/dynl.c
@ -511,9 +511,7 @@ scm_init_dynamic_linking ()
  scm_set_smob_mark (scm_tc16_dynamic_obj, dynl_obj_mark);
  scm_set_smob_print (scm_tc16_dynamic_obj, dynl_obj_print);
  sysdep_dynl_init ();
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/dynl.x"
-#endif
 }

 /*
--- a/libguile/dynwind.c
+++ b/libguile/dynwind.c
@ -276,9 +276,7 @@ scm_init_dynwind ()
 {
  tc16_guards = scm_make_smob_type ("guards", 0);
  scm_set_smob_print (tc16_guards, guards_print);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/dynwind.x"
-#endif
 }

 /*
--- a/libguile/environments.c
+++ b/libguile/environments.c
@ -2360,9 +2360,7 @@ scm_environments_prehistory ()
 void
 scm_init_environments ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/environments.x"
-#endif
 }


--- a/libguile/eq.c
+++ b/libguile/eq.c
@ -202,9 +202,7 @@ SCM_DEFINE1 (scm_equal_p, "equal?", scm_tc7_rpsubr,
 void
 scm_init_eq ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/eq.x"
-#endif
 }


--- a/libguile/error.c
+++ b/libguile/error.c
@ -348,9 +348,7 @@ void
 scm_init_error ()
 {
 #include "libguile/cpp_err_symbols.c"
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/error.x"
-#endif
 }


--- a/libguile/eval.c
+++ b/libguile/eval.c
@ -4195,9 +4195,7 @@ scm_init_eval ()
    scm_c_define ("scm:eval-transformer", scm_make_fluid ());
 #endif

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/eval.x"
-#endif

  scm_c_define ("nil", scm_lisp_nil);
  scm_c_define ("t", scm_lisp_t);
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@ -147,9 +147,7 @@ void
 scm_init_evalext ()
 {
  scm_make_synt (scm_s_set_x, scm_makmmacro, scm_m_generalized_set_x);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/evalext.x"
-#endif
 }

 /*
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@ -164,9 +164,7 @@ void
 scm_init_extensions ()
 {
  registered_extensions = NULL;
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/extensions.x"
-#endif
 }

 /*
--- a/libguile/feature.c
+++ b/libguile/feature.c
@ -126,9 +126,7 @@ scm_init_feature()
  
  scm_c_define ("char-code-limit", SCM_MAKINUM (SCM_CHAR_CODE_LIMIT));

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/feature.x"
-#endif
 }

 /*
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@ -1545,9 +1545,7 @@ scm_init_filesys ()
  scm_c_define ("FD_CLOEXEC", scm_long2num (FD_CLOEXEC));
 #endif

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/filesys.x"
-#endif
 }

 /*
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@ -261,9 +261,7 @@ scm_init_fluids ()
 {
  scm_tc16_fluid = scm_make_smob_type ("fluid", 0);
  scm_set_smob_print (scm_tc16_fluid, fluid_print);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/fluids.x"
-#endif
 }

 #if SCM_DEBUG_DEPRECATED == 0
--- a/libguile/fports.c
+++ b/libguile/fports.c
@ -857,9 +857,7 @@ scm_init_fports ()
  scm_c_define ("_IOLBF", SCM_MAKINUM (_IOLBF));
  scm_c_define ("_IONBF", SCM_MAKINUM (_IONBF));

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/fports.x"
-#endif
 }

 /*
--- a/libguile/gc.c
+++ b/libguile/gc.c
@ -2917,9 +2917,7 @@ scm_init_gc ()

  scm_c_hook_add (&scm_after_gc_c_hook, mark_gc_async, NULL, 0);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/gc.x"
-#endif
 }

 #endif /*MARK_DEPENDENCIES*/
--- a/libguile/goops.c
+++ b/libguile/goops.c
@ -2660,9 +2660,7 @@ scm_init_goops_builtins (void)

  goops_rstate = scm_c_make_rstate ("GOOPS", 5);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/goops.x"
-#endif

  list_of_no_method = scm_permanent_object (scm_list_1 (sym_no_method));

--- a/libguile/gsubr.c
+++ b/libguile/gsubr.c
@ -290,9 +290,7 @@ scm_init_gsubr()
  scm_c_define_gsubr ("gsubr-2-1-l", 2, 1, 1, gsubr_21l); /* example */
 #endif

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/gsubr.x"
-#endif
 }

 #if SCM_DEBUG_DEPRECATED == 0
--- a/libguile/guardians.c
+++ b/libguile/guardians.c
@ -635,9 +635,7 @@ scm_init_guardians ()
  greedily_guarded_whash =
    scm_permanent_object (scm_make_doubly_weak_hash_table (SCM_MAKINUM (31)));

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/guardians.x"
-#endif
 }

 /*
--- a/libguile/hash.c
+++ b/libguile/hash.c
@ -272,9 +272,7 @@ SCM_DEFINE (scm_hash, "hash", 2, 0, 0,
 void
 scm_init_hash ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/hash.x"
-#endif
 }


--- a/libguile/hashtab.c
+++ b/libguile/hashtab.c
@ -561,9 +561,7 @@ scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table)
 void
 scm_init_hashtab ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/hashtab.x"
-#endif
 }

 /*
--- a/libguile/hooks.c
+++ b/libguile/hooks.c
@ -334,9 +334,7 @@ scm_init_hooks ()
  scm_tc16_hook = scm_make_smob_type ("hook", 0);
  scm_set_smob_mark (scm_tc16_hook, scm_markcdr);
  scm_set_smob_print (scm_tc16_hook, hook_print);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/hooks.x"
-#endif
 }

 /*
--- a/libguile/ioext.c
+++ b/libguile/ioext.c
@ -316,9 +316,7 @@ scm_init_ioext ()
 {
  scm_add_feature ("i/o-extensions");

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/ioext.x"
-#endif
 }


--- a/libguile/iselect.c
+++ b/libguile/iselect.c
@ -620,9 +620,7 @@ scm_init_iselect ()
  timeout0.tv_usec = 0;
 #endif
  init_bc (0x80, 0, 0);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/iselect.x"
-#endif
 }

 #endif /* GUILE_ISELECT */
--- a/libguile/keywords.c
+++ b/libguile/keywords.c
@ -139,9 +139,7 @@ scm_init_keywords ()
  scm_set_smob_print (scm_tc16_keyword, keyword_print);

  scm_keyword_obarray = scm_c_make_hash_table (256);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/keywords.x"
-#endif
 }


--- a/libguile/lang.c
+++ b/libguile/lang.c
@ -154,9 +154,7 @@ SCM_DEFINE1 (scm_nil_eq, "nil-eq", scm_tc7_rpsubr,
 void
 scm_init_lang ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/lang.x"
-#endif
  scm_make_synt ("nil-while", scm_makacro, scm_m_while);
 }

--- a/libguile/list.c
+++ b/libguile/list.c
@ -898,9 +898,7 @@ SCM_DEFINE (scm_delete1_x, "delete1!", 2, 0, 0,
 void
 scm_init_list ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/list.x"
-#endif
 }

 /*
--- a/libguile/load.c
+++ b/libguile/load.c
@ -527,9 +527,7 @@ scm_init_load ()

  init_build_info ();

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/load.x"
-#endif
 }

 /*
--- a/libguile/macros.c
+++ b/libguile/macros.c
@ -230,9 +230,7 @@ scm_init_macros ()
  scm_tc16_macro = scm_make_smob_type ("macro", 0);
  scm_set_smob_mark (scm_tc16_macro, scm_markcdr);
  scm_set_smob_print (scm_tc16_macro, macro_print);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/macros.x"
-#endif
 }

 /*
--- a/libguile/modules.c
+++ b/libguile/modules.c
@ -613,9 +613,7 @@ scm_modules_prehistory ()
 void
 scm_init_modules ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/modules.x"
-#endif
  module_make_local_var_x_var = scm_c_define ("module-make-local-var!",
 					    SCM_UNDEFINED);
  scm_tc16_eval_closure = scm_make_smob_type ("eval-closure", 0);
--- a/libguile/net_db.c
+++ b/libguile/net_db.c
@ -447,9 +447,7 @@ void
 scm_init_net_db ()
 {
  scm_add_feature ("net-db");
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/net_db.x"
-#endif
 }

 /*
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@ -4504,9 +4504,7 @@ scm_init_numbers ()
  check_sanity ();
 #endif
  
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/numbers.x"
-#endif
 }

 #if (SCM_DEBUG_DEPRECATED == 0)
--- a/libguile/objects.c
+++ b/libguile/objects.c
@ -520,9 +520,7 @@ scm_init_objects ()
  SCM_SET_CLASS_DESTRUCTOR (et, scm_struct_free_entity);
  scm_c_define ("<entity>", et);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/objects.x"
-#endif
 }

 /*
--- a/libguile/objprop.c
+++ b/libguile/objprop.c
@ -118,9 +118,7 @@ void
 scm_init_objprop ()
 {
  scm_object_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511));
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/objprop.x"
-#endif
 }


--- a/libguile/options.c
+++ b/libguile/options.c
@ -237,9 +237,7 @@ void
 scm_init_options ()
 {
  protected_objects = scm_permanent_object (scm_cons (SCM_UNDEFINED, SCM_EOL));
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/options.x"
-#endif
 }

 /*
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@ -190,9 +190,7 @@ scm_init_pairs ()
  for (subnr = 0; cxrs [subnr]; subnr++)
    scm_c_define_subr (cxrs [subnr], scm_tc7_cxr, NULL);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/pairs.x"
-#endif
 }


--- a/libguile/ports.c
+++ b/libguile/ports.c
@ -1604,9 +1604,7 @@ scm_init_ports ()

  scm_tc16_void_port = scm_make_port_type ("void", fill_input_void_port, 
 					   write_void_port);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/ports.x"
-#endif
 }

 /*
--- a/libguile/posix.c
+++ b/libguile/posix.c
@ -1689,9 +1689,7 @@ scm_init_posix ()
 #endif

 #include "libguile/cpp_sig_symbols.c"
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/posix.x"
-#endif
 }

 /*
--- a/libguile/print.c
+++ b/libguile/print.c
@ -1120,9 +1120,7 @@ scm_init_print ()
  scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr);
  scm_set_smob_print (scm_tc16_port_with_ps, port_with_ps_print);
  
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/print.x"
-#endif
 }

 /*
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@ -246,9 +246,7 @@ SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0,
 void
 scm_init_procprop ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/procprop.x"
-#endif
 }


--- a/libguile/procs.c
+++ b/libguile/procs.c
@ -396,9 +396,7 @@ scm_init_subr_table ()
 void
 scm_init_procs ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/procs.x"
-#endif
 }

 #if SCM_DEBUG_DEPRECATED == 0
--- a/libguile/properties.c
+++ b/libguile/properties.c
@ -148,9 +148,7 @@ void
 scm_init_properties ()
 {
  scm_properties_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511));
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/properties.x"
-#endif
 }


--- a/libguile/ramap.c
+++ b/libguile/ramap.c
@ -2060,9 +2060,7 @@ scm_init_ramap ()
  init_raprocs (ra_asubrs);
  scm_c_define_subr (s_array_equal_p, scm_tc7_rpsubr, scm_array_equal_p);
  scm_smobs[SCM_TC2SMOBNUM (scm_tc16_array)].equalp = scm_raequal;
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/ramap.x"
-#endif
  scm_add_feature (s_scm_array_for_each);
 }

--- a/libguile/random.c
+++ b/libguile/random.c
@ -590,9 +590,7 @@ scm_init_random ()
    for (i = m >> 1; i < m; ++i)
      scm_masktab[i] = m - 1;
  
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/random.x"
-#endif

  /* Check that the assumptions about bits per bignum digit are correct. */
 #if SIZEOF_INT == 4
--- a/libguile/rdelim.c
+++ b/libguile/rdelim.c
@ -285,9 +285,7 @@ SCM_DEFINE (scm_write_line, "write-line", 1, 1, 0,
 SCM
 scm_init_rdelim_builtins (void)
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/rdelim.x"
-#endif

  return SCM_UNSPECIFIED;
 }
--- a/libguile/read.c
+++ b/libguile/read.c
@ -837,9 +837,7 @@ scm_init_read ()
    SCM_VARIABLE_LOC (scm_c_define ("read-hash-procedures", SCM_EOL));

  scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS);
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/read.x"
-#endif
 }

 /*
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@ -310,9 +310,7 @@ scm_init_regex_posix ()
  scm_c_define ("regexp/notbol", scm_long2num (REG_NOTBOL));
  scm_c_define ("regexp/noteol", scm_long2num (REG_NOTEOL));

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/regex-posix.x"
-#endif

  scm_add_feature ("regex");
 }
--- a/libguile/root.c
+++ b/libguile/root.c
@ -429,9 +429,7 @@ scm_init_root ()
  scm_set_smob_mark (scm_tc16_root, root_mark);
  scm_set_smob_print (scm_tc16_root, root_print);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/root.x"
-#endif
 }

 /*
--- a/libguile/rw.c
+++ b/libguile/rw.c
@ -275,9 +275,7 @@ SCM_DEFINE (scm_write_string_partial, "write-string/partial", 1, 3, 0,
 SCM 
 scm_init_rw_builtins ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/rw.x"
-#endif

  return SCM_UNSPECIFIED;
 }
--- a/libguile/scmsigs.c
+++ b/libguile/scmsigs.c
@ -646,9 +646,7 @@ scm_init_scmsigs ()
  scm_c_define ("ITIMER_PROF", SCM_MAKINUM (ITIMER_PROF));
 #endif /* defined(HAVE_SETITIMER) || defined(HAVE_GETITIMER) */

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/scmsigs.x"
-#endif
 }


--- a/libguile/script.c
+++ b/libguile/script.c
@ -681,9 +681,7 @@ scm_shell (int argc, char **argv)
 void
 scm_init_script ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/script.x"
-#endif
 }

 /*
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@ -134,9 +134,7 @@ SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0,
 void
 scm_init_simpos ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/simpos.x"
-#endif
 }


--- a/libguile/socket.c
+++ b/libguile/socket.c
@ -1386,9 +1386,7 @@ scm_init_socket ()

  scm_add_feature ("socket");

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/socket.x"
-#endif
 }


--- a/libguile/sort.c
+++ b/libguile/sort.c
@ -954,9 +954,7 @@ SCM_DEFINE (scm_sort_list, "sort-list", 2, 0, 0,
 void
 scm_init_sort ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/sort.x"
-#endif

  scm_add_feature ("sort");
 }
--- a/libguile/srcprop.c
+++ b/libguile/srcprop.c
@ -334,9 +334,7 @@ scm_init_srcprop ()
  scm_source_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (2047));
  scm_c_define ("source-whash", scm_source_whash);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/srcprop.x"
-#endif
 }

 void
--- a/libguile/stackchk.c
+++ b/libguile/stackchk.c
@ -101,9 +101,7 @@ scm_stack_report ()
 void
 scm_init_stackchk ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/stackchk.x"
-#endif
 }

 /*
--- a/libguile/stacks.c
+++ b/libguile/stacks.c
@ -764,9 +764,7 @@ scm_init_stacks ()
 					     scm_cons (stack_layout,
 						       SCM_EOL)));
  scm_set_struct_vtable_name_x (scm_stack_type, scm_str2symbol ("stack"));
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/stacks.x"
-#endif
 }

 /*
--- a/libguile/stime.c
+++ b/libguile/stime.c
@ -716,9 +716,7 @@ scm_init_stime()
  if (!scm_my_base) scm_my_base = mytime();

  scm_add_feature ("current-time");
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/stime.x"
-#endif
 }


--- a/libguile/strings.c
+++ b/libguile/strings.c
@ -455,9 +455,7 @@ scm_init_strings ()
 {
  scm_nullstr = scm_allocate_string (0);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strings.x"
-#endif
 }


--- a/libguile/strop.c
+++ b/libguile/strop.c
@ -591,9 +591,7 @@ SCM_DEFINE (scm_string_ci_to_symbol, "string-ci->symbol", 1, 0, 0,
 void
 scm_init_strop ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strop.x"
-#endif
 }

 /*
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@ -292,9 +292,7 @@ SCM_DEFINE1 (scm_string_ci_geq_p, "string-ci>=?", scm_tc7_rpsubr,
 void
 scm_init_strorder ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strorder.x"
-#endif
 }


--- a/libguile/strports.c
+++ b/libguile/strports.c
@ -525,9 +525,7 @@ scm_init_strports ()
 {
  scm_tc16_strport = scm_make_stptob ();

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/strports.x"
-#endif
 }


--- a/libguile/struct.c
+++ b/libguile/struct.c
@ -829,9 +829,7 @@ scm_init_struct ()
  scm_c_define ("vtable-index-printer",
 		SCM_MAKINUM (scm_vtable_index_printer));
  scm_c_define ("vtable-offset-user", SCM_MAKINUM (scm_vtable_offset_user));
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/struct.x"
-#endif
 }

 /*
--- a/libguile/symbols-deprecated.c
+++ b/libguile/symbols-deprecated.c
@ -621,9 +621,7 @@ void
 scm_init_symbols_deprecated ()
 {
  gentemp_counter = 0;
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/symbols-deprecated.x"
-#endif
 }

 #endif /* SCM_ENABLE_VCELLS */
--- a/libguile/symbols.c
+++ b/libguile/symbols.c
@ -331,9 +331,7 @@ void
 scm_init_symbols ()
 {
  gensym_counter = 0;
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/symbols.x"
-#endif
 #if SCM_ENABLE_VCELLS
  scm_init_symbols_deprecated ();
 #endif
--- a/libguile/threads.c
+++ b/libguile/threads.c
@ -141,9 +141,7 @@ scm_init_threads (SCM_STACKITEM *i)
  scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m));
  scm_tc16_condvar = scm_make_smob_type ("condition-variable", sizeof (coop_c));
                                        
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/threads.x"
-#endif
  /* Initialize implementation specific details of the threads support */
  scm_threads_init (i);
 }
--- a/libguile/throw.c
+++ b/libguile/throw.c
@ -696,9 +696,7 @@ scm_init_throw ()
  tc16_lazy_catch = scm_make_smob_type ("lazy-catch", 0);
  scm_set_smob_print (tc16_lazy_catch, lazy_catch_print);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/throw.x"
-#endif
 }

 /*
--- a/libguile/unif.c
+++ b/libguile/unif.c
@ -2612,9 +2612,7 @@ scm_init_unif ()
  scm_set_smob_print (scm_tc16_array, scm_raprin1);
  scm_set_smob_equalp (scm_tc16_array, scm_array_equal_p);
  scm_add_feature ("array");
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/unif.x"
-#endif
 }

 /*
--- a/libguile/values.c
+++ b/libguile/values.c
@ -106,9 +106,7 @@ scm_init_values (void)

  scm_add_feature ("values");

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/values.x"
-#endif
 }

 /*
--- a/libguile/variable.c
+++ b/libguile/variable.c
@ -197,9 +197,7 @@ scm_init_variable ()
  scm_set_smob_print (scm_tc16_variable, variable_print);
  scm_set_smob_equalp (scm_tc16_variable, variable_equalp);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/variable.x"
-#endif
 }

 /*
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@ -425,9 +425,7 @@ scm_init_vectors ()
 {
  scm_nullvect = scm_c_make_vector (0, SCM_UNDEFINED);

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/vectors.x"
-#endif
 }


--- a/libguile/version.c
+++ b/libguile/version.c
@ -128,9 +128,7 @@ SCM_DEFINE (scm_version, "version", 0, 0, 0,
 void
 scm_init_version ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/version.x"
-#endif
 }

 /*
--- a/libguile/vports.c
+++ b/libguile/vports.c
@ -220,9 +220,7 @@ scm_init_vports ()
 {
  scm_tc16_sfport = scm_make_sfptob ();

-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/vports.x"
-#endif
 }

 /*
--- a/libguile/weaks.c
+++ b/libguile/weaks.c
@ -363,9 +363,7 @@ scm_weaks_prehistory ()
 void
 scm_init_weaks ()
 {
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/weaks.x"
-#endif
 }