Index: guiledlopenhelper.c
===================================================================
RCS file: /cvs/gnome/gnome-guile/guile-gtk/guiledlopenhelper.c,v
retrieving revision 1.10
diff -u -r1.10 guiledlopenhelper.c
--- guiledlopenhelper.c	2001/05/21 02:25:52	1.10
+++ guiledlopenhelper.c	2002/01/25 16:15:23
@@ -31,11 +31,11 @@
 
   SCM_ASSERT (SCM_NIMP(name) && SCM_STRINGP(name), name,
 	      SCM_ARG1, "%sgtk-dlopen");
-  SCM_COERCE_SUBSTR (name);
+  SCM_STRING_COERCE_0TERMINATION_X (name);
 
   SCM_ASSERT (SCM_NIMP(fullname) && SCM_STRINGP(fullname), fullname,
 	      SCM_ARG2, "%sgtk-dlopen");
-  SCM_COERCE_SUBSTR (fullname);
+  SCM_STRING_COERCE_0TERMINATION_X (fullname);
 
   SCM_DEFER_INTS;
 #ifdef HAVE_DLOPEN
@@ -52,12 +52,12 @@
    */
 #ifdef RTLD_GLOBAL
 #if (defined __NetBSD__)
-  handle = dlopen (SCM_CHARS (fullname), RTLD_LAZY|RTLD_GLOBAL);
+  handle = dlopen (SCM_STRING_CHARS (fullname), RTLD_LAZY|RTLD_GLOBAL);
 #else
-  handle = dlopen (SCM_CHARS (name), RTLD_LAZY|RTLD_GLOBAL);
+  handle = dlopen (SCM_STRING_CHARS (name), RTLD_LAZY|RTLD_GLOBAL);
 #endif
 #else
-  handle = dlopen (SCM_CHARS (fullname), RTLD_LAZY);
+  handle = dlopen (SCM_STRING_CHARS (fullname), RTLD_LAZY);
 #endif
   if (handle == NULL)
     fprintf (stderr, "dlopen: %s\n", dlerror ());
@@ -77,25 +77,25 @@
   SCM_ASSERT (SCM_NIMP(sym) && SCM_STRINGP(sym), sym,
 	      SCM_ARG1, "%sgtk-dlinit");
   handle = (void *)scm_num2ulong (lib, (char *)SCM_ARG2, "%sgtk-dlinit");
-  SCM_COERCE_SUBSTR (sym);
+  SCM_STRING_COERCE_0TERMINATION_X (sym);
   
   SCM_DEFER_INTS;
 #ifdef HAVE_DLOPEN
 #if (defined __NetBSD__)
   do {
-    char *symbol = scm_must_malloc (strlen (SCM_CHARS (sym)) + 2, "dlsym");
+    char *symbol = scm_must_malloc (strlen (SCM_STRING_CHARS (sym)) + 2, "dlsym");
 
-    sprintf (symbol, "_%s", SCM_CHARS (sym));
+    sprintf (symbol, "_%s", SCM_STRING_CHARS (sym));
     func = (void (*)())dlsym (handle, symbol);
     scm_must_free (symbol);
   } while (0);
 #else
-  func = (void (*)())dlsym (handle, SCM_CHARS (sym));
+  func = (void (*)())dlsym (handle, SCM_STRING_CHARS (sym));
 #endif
   if (func)
     func ();
   else
-    fprintf (stderr, "dlsym (%s): %s\n", SCM_CHARS (sym), dlerror ());
+    fprintf (stderr, "dlsym (%s): %s\n", SCM_STRING_CHARS (sym), dlerror ());
 #endif
   SCM_ALLOW_INTS;