Avoid using module operations from C.

* srfi-13.c (scm_init_srfi_13_14): Removed.
* srfi-14.h, srfi-14.c (scm_c_init_srfi_14): New.  Contains
initializations needed by C clients of srfi-14.
(scm_init_srfi_13, scm_init_srfi_14): Call it.
* srfi-13.scm: Call "scm_init_srf_13" instead of
"scm_init_srfi_13_14".
* srfi-14.scm: Call "scm_init_srf_14" instead of
"scm_init_srfi_13_14".

1 files changed, 16 insertions, 5 deletions

diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
index 9fb6b4847..24388fc5c 100644
--- a/srfi/srfi-14.c
+++ b/srfi/srfi-14.c
@@ -1348,13 +1348,24 @@ SCM_DEFINE (scm_char_set_diff_plus_intersection_x, "char-set-diff+intersection!"
 
 
 void
-scm_init_srfi_14 (void)
+scm_c_init_srfi_14 (void)
 {
-  scm_tc16_charset = scm_make_smob_type ("character-set", 
-					 SCM_CHARSET_SIZE * sizeof (long));
-  scm_set_smob_free (scm_tc16_charset, charset_free);
-  scm_set_smob_print (scm_tc16_charset, charset_print);
+  static initialized = 0;
+
+  if (!initialized)
+    {
+      scm_tc16_charset = scm_make_smob_type ("character-set", 
+					     SCM_CHARSET_SIZE * sizeof (long));
+      scm_set_smob_free (scm_tc16_charset, charset_free);
+      scm_set_smob_print (scm_tc16_charset, charset_print);
+      initialized = 1;
+    }
+}
 
+void
+scm_init_srfi_14 (void)
+{
+  scm_c_init_srfi_14 ();
 #ifndef SCM_MAGIC_SNARFER
 #include "srfi/srfi-14.x"
 #endif