Retire inclusion guard macro SCM_MAGIC_SNARFER.

diff --git a/srfi/srfi-13.c b/srfi/srfi-13.c
index 38d53fe..70aed6a 100644 (file)
--- a/srfi/srfi-13.c
+++ b/srfi/srfi-13.c
@@ -3037,9 +3037,7 @@ scm_init_srfi_13 (void)
   scm_c_init_srfi_14 ();
 
   /* Install the string primitives.  */
-#ifndef SCM_MAGIC_SNARFER
 #include "srfi/srfi-13.x"
-#endif
 }
 
 /* End of srfi-13.c.  */

diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c
index e16f233..cb34182 100644 (file)
--- a/srfi/srfi-14.c
+++ b/srfi/srfi-14.c
@@ -1,17 +1,17 @@
 /* srfi-14.c --- SRFI-14 procedures for Guile
  *
  * Copyright (C) 2001 Free Software Foundation, Inc.
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2, or (at
  * your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
@@ -98,14 +98,14 @@ static SCM
 make_char_set (const char * func_name)
 {
   long * p;
-  
+
   p = scm_gc_malloc (BYTES_PER_CHARSET, "character-set");
   memset (p, 0, BYTES_PER_CHARSET);
   SCM_RETURN_NEWSMOB (scm_tc16_charset, p);
 }
 
 
-SCM_DEFINE (scm_char_set_p, "char-set?", 1, 0, 0, 
+SCM_DEFINE (scm_char_set_p, "char-set?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a character set, @code{#f}\n"
            "otherwise.")
@@ -167,7 +167,7 @@ SCM_DEFINE (scm_char_set_leq, "char-set<=", 0, 0, 1,
       if (prev_data)
        {
          int k;
-         
+
          for (k = 0; k < LONGS_PER_CHARSET; k++)
            {
              if ((prev_data[k] & csi_data[k]) != prev_data[k])
@@ -196,7 +196,7 @@ SCM_DEFINE (scm_char_set_hash, "char-set-hash", 1, 1, 0,
   int k;
 
   SCM_VALIDATE_SMOB (1, cs, charset);
-  
+
   if (SCM_UNBNDP (bound))
     bnd = default_bnd;
   else
@@ -1447,9 +1447,7 @@ scm_init_srfi_14 (void)
   scm_c_init_srfi_14 ();
 
   /* Install the charset primitives.  */
-#ifndef SCM_MAGIC_SNARFER
 #include "srfi/srfi-14.x"
-#endif
 }
 
 /* End of srfi-14.c.  */

diff --git a/srfi/srfi-4.c b/srfi/srfi-4.c
index c059707..1643ae9 100644 (file)
--- a/srfi/srfi-4.c
+++ b/srfi/srfi-4.c
@@ -1,17 +1,17 @@
 /* srfi-4.c --- Homogeneous numeric vector datatypes.
  *
  *     Copyright (C) 2001 Free Software Foundation, Inc.
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2, or (at
  * your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this software; see the file COPYING.  If not, write to
  * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
@@ -364,7 +364,7 @@ static SCM
 make_uvec (const char * func_name, int type, int len)
 {
   void * p;
-  
+
   p = scm_gc_malloc (len * uvec_sizes[type], "uvec");
   SCM_RETURN_NEWSMOB3 (scm_tc16_uvec, type, len, p);
 }
@@ -375,7 +375,7 @@ make_uvec (const char * func_name, int type, int len)
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_u8vector_p, "u8vector?", 1, 0, 0, 
+SCM_DEFINE (scm_u8vector_p, "u8vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type u8,\n"
            "@code{#f} otherwise.")
@@ -387,7 +387,7 @@ SCM_DEFINE (scm_u8vector_p, "u8vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_u8vector, "make-u8vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_u8vector, "make-u8vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -420,7 +420,7 @@ SCM_DEFINE (scm_make_u8vector, "make-u8vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u8vector, "u8vector", 0, 0, 1, 
+SCM_DEFINE (scm_u8vector, "u8vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -432,7 +432,7 @@ SCM_DEFINE (scm_u8vector, "u8vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u8vector_length, "u8vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_u8vector_length, "u8vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -446,7 +446,7 @@ SCM_DEFINE (scm_u8vector_length, "u8vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u8vector_ref, "u8vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_u8vector_ref, "u8vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -467,7 +467,7 @@ SCM_DEFINE (scm_u8vector_ref, "u8vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u8vector_set_x, "u8vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_u8vector_set_x, "u8vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -497,7 +497,7 @@ SCM_DEFINE (scm_u8vector_set_x, "u8vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u8vector_to_list, "u8vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_u8vector_to_list, "u8vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_u8vector_to_list
@@ -561,7 +561,7 @@ SCM_DEFINE (scm_list_to_u8vector, "list->u8vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_s8vector_p, "s8vector?", 1, 0, 0, 
+SCM_DEFINE (scm_s8vector_p, "s8vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type s8,\n"
            "@code{#f} otherwise.")
@@ -573,7 +573,7 @@ SCM_DEFINE (scm_s8vector_p, "s8vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_s8vector, "make-s8vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_s8vector, "make-s8vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -606,7 +606,7 @@ SCM_DEFINE (scm_make_s8vector, "make-s8vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s8vector, "s8vector", 0, 0, 1, 
+SCM_DEFINE (scm_s8vector, "s8vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -618,7 +618,7 @@ SCM_DEFINE (scm_s8vector, "s8vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s8vector_length, "s8vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_s8vector_length, "s8vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -632,7 +632,7 @@ SCM_DEFINE (scm_s8vector_length, "s8vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s8vector_ref, "s8vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_s8vector_ref, "s8vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -653,7 +653,7 @@ SCM_DEFINE (scm_s8vector_ref, "s8vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s8vector_set_x, "s8vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_s8vector_set_x, "s8vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -683,7 +683,7 @@ SCM_DEFINE (scm_s8vector_set_x, "s8vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s8vector_to_list, "s8vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_s8vector_to_list, "s8vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_s8vector_to_list
@@ -749,7 +749,7 @@ SCM_DEFINE (scm_list_to_s8vector, "list->s8vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_u16vector_p, "u16vector?", 1, 0, 0, 
+SCM_DEFINE (scm_u16vector_p, "u16vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type u16,\n"
            "@code{#f} otherwise.")
@@ -761,7 +761,7 @@ SCM_DEFINE (scm_u16vector_p, "u16vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_u16vector, "make-u16vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_u16vector, "make-u16vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -789,7 +789,7 @@ SCM_DEFINE (scm_make_u16vector, "make-u16vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u16vector, "u16vector", 0, 0, 1, 
+SCM_DEFINE (scm_u16vector, "u16vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -801,7 +801,7 @@ SCM_DEFINE (scm_u16vector, "u16vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u16vector_length, "u16vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_u16vector_length, "u16vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -815,7 +815,7 @@ SCM_DEFINE (scm_u16vector_length, "u16vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u16vector_ref, "u16vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_u16vector_ref, "u16vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -836,7 +836,7 @@ SCM_DEFINE (scm_u16vector_ref, "u16vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u16vector_set_x, "u16vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_u16vector_set_x, "u16vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -862,7 +862,7 @@ SCM_DEFINE (scm_u16vector_set_x, "u16vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u16vector_to_list, "u16vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_u16vector_to_list, "u16vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_u16vector_to_list
@@ -919,7 +919,7 @@ SCM_DEFINE (scm_list_to_u16vector, "list->u16vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_s16vector_p, "s16vector?", 1, 0, 0, 
+SCM_DEFINE (scm_s16vector_p, "s16vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type s16,\n"
            "@code{#f} otherwise.")
@@ -931,7 +931,7 @@ SCM_DEFINE (scm_s16vector_p, "s16vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_s16vector, "make-s16vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_s16vector, "make-s16vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -959,7 +959,7 @@ SCM_DEFINE (scm_make_s16vector, "make-s16vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s16vector, "s16vector", 0, 0, 1, 
+SCM_DEFINE (scm_s16vector, "s16vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -971,7 +971,7 @@ SCM_DEFINE (scm_s16vector, "s16vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s16vector_length, "s16vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_s16vector_length, "s16vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -985,7 +985,7 @@ SCM_DEFINE (scm_s16vector_length, "s16vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s16vector_ref, "s16vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_s16vector_ref, "s16vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -1006,7 +1006,7 @@ SCM_DEFINE (scm_s16vector_ref, "s16vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s16vector_set_x, "s16vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_s16vector_set_x, "s16vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -1032,7 +1032,7 @@ SCM_DEFINE (scm_s16vector_set_x, "s16vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s16vector_to_list, "s16vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_s16vector_to_list, "s16vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_s16vector_to_list
@@ -1092,7 +1092,7 @@ SCM_DEFINE (scm_list_to_s16vector, "list->s16vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_u32vector_p, "u32vector?", 1, 0, 0, 
+SCM_DEFINE (scm_u32vector_p, "u32vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type u32,\n"
            "@code{#f} otherwise.")
@@ -1104,7 +1104,7 @@ SCM_DEFINE (scm_u32vector_p, "u32vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_u32vector, "make-u32vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_u32vector, "make-u32vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -1132,7 +1132,7 @@ SCM_DEFINE (scm_make_u32vector, "make-u32vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u32vector, "u32vector", 0, 0, 1, 
+SCM_DEFINE (scm_u32vector, "u32vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -1144,7 +1144,7 @@ SCM_DEFINE (scm_u32vector, "u32vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u32vector_length, "u32vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_u32vector_length, "u32vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -1158,7 +1158,7 @@ SCM_DEFINE (scm_u32vector_length, "u32vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u32vector_ref, "u32vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_u32vector_ref, "u32vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -1179,7 +1179,7 @@ SCM_DEFINE (scm_u32vector_ref, "u32vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u32vector_set_x, "u32vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_u32vector_set_x, "u32vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -1205,7 +1205,7 @@ SCM_DEFINE (scm_u32vector_set_x, "u32vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u32vector_to_list, "u32vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_u32vector_to_list, "u32vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_u32vector_to_list
@@ -1263,7 +1263,7 @@ SCM_DEFINE (scm_list_to_u32vector, "list->u32vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_s32vector_p, "s32vector?", 1, 0, 0, 
+SCM_DEFINE (scm_s32vector_p, "s32vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type s32,\n"
            "@code{#f} otherwise.")
@@ -1275,7 +1275,7 @@ SCM_DEFINE (scm_s32vector_p, "s32vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_s32vector, "make-s32vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_s32vector, "make-s32vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -1303,7 +1303,7 @@ SCM_DEFINE (scm_make_s32vector, "make-s32vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s32vector, "s32vector", 0, 0, 1, 
+SCM_DEFINE (scm_s32vector, "s32vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -1315,7 +1315,7 @@ SCM_DEFINE (scm_s32vector, "s32vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s32vector_length, "s32vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_s32vector_length, "s32vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -1329,7 +1329,7 @@ SCM_DEFINE (scm_s32vector_length, "s32vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s32vector_ref, "s32vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_s32vector_ref, "s32vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -1350,7 +1350,7 @@ SCM_DEFINE (scm_s32vector_ref, "s32vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s32vector_set_x, "s32vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_s32vector_set_x, "s32vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -1376,7 +1376,7 @@ SCM_DEFINE (scm_s32vector_set_x, "s32vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s32vector_to_list, "s32vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_s32vector_to_list, "s32vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_s32vector_to_list
@@ -1436,7 +1436,7 @@ SCM_DEFINE (scm_list_to_s32vector, "list->s32vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_u64vector_p, "u64vector?", 1, 0, 0, 
+SCM_DEFINE (scm_u64vector_p, "u64vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type u64,\n"
            "@code{#f} otherwise.")
@@ -1448,7 +1448,7 @@ SCM_DEFINE (scm_u64vector_p, "u64vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_u64vector, "make-u64vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_u64vector, "make-u64vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -1476,7 +1476,7 @@ SCM_DEFINE (scm_make_u64vector, "make-u64vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u64vector, "u64vector", 0, 0, 1, 
+SCM_DEFINE (scm_u64vector, "u64vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -1488,7 +1488,7 @@ SCM_DEFINE (scm_u64vector, "u64vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u64vector_length, "u64vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_u64vector_length, "u64vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -1502,7 +1502,7 @@ SCM_DEFINE (scm_u64vector_length, "u64vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u64vector_ref, "u64vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_u64vector_ref, "u64vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -1523,7 +1523,7 @@ SCM_DEFINE (scm_u64vector_ref, "u64vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u64vector_set_x, "u64vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_u64vector_set_x, "u64vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -1549,7 +1549,7 @@ SCM_DEFINE (scm_u64vector_set_x, "u64vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_u64vector_to_list, "u64vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_u64vector_to_list, "u64vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_u64vector_to_list
@@ -1607,7 +1607,7 @@ SCM_DEFINE (scm_list_to_u64vector, "list->u64vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_s64vector_p, "s64vector?", 1, 0, 0, 
+SCM_DEFINE (scm_s64vector_p, "s64vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type s64,\n"
            "@code{#f} otherwise.")
@@ -1619,7 +1619,7 @@ SCM_DEFINE (scm_s64vector_p, "s64vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_s64vector, "make-s64vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_s64vector, "make-s64vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -1647,7 +1647,7 @@ SCM_DEFINE (scm_make_s64vector, "make-s64vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s64vector, "s64vector", 0, 0, 1, 
+SCM_DEFINE (scm_s64vector, "s64vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -1659,7 +1659,7 @@ SCM_DEFINE (scm_s64vector, "s64vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s64vector_length, "s64vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_s64vector_length, "s64vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -1673,7 +1673,7 @@ SCM_DEFINE (scm_s64vector_length, "s64vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s64vector_ref, "s64vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_s64vector_ref, "s64vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -1694,7 +1694,7 @@ SCM_DEFINE (scm_s64vector_ref, "s64vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s64vector_set_x, "s64vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_s64vector_set_x, "s64vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -1720,7 +1720,7 @@ SCM_DEFINE (scm_s64vector_set_x, "s64vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_s64vector_to_list, "s64vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_s64vector_to_list, "s64vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_s64vector_to_list
@@ -1780,7 +1780,7 @@ SCM_DEFINE (scm_list_to_s64vector, "list->s64vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_f32vector_p, "f32vector?", 1, 0, 0, 
+SCM_DEFINE (scm_f32vector_p, "f32vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type f32,\n"
            "@code{#f} otherwise.")
@@ -1792,7 +1792,7 @@ SCM_DEFINE (scm_f32vector_p, "f32vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_f32vector, "make-f32vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_f32vector, "make-f32vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -1829,7 +1829,7 @@ SCM_DEFINE (scm_make_f32vector, "make-f32vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f32vector, "f32vector", 0, 0, 1, 
+SCM_DEFINE (scm_f32vector, "f32vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -1841,7 +1841,7 @@ SCM_DEFINE (scm_f32vector, "f32vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f32vector_length, "f32vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_f32vector_length, "f32vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -1855,7 +1855,7 @@ SCM_DEFINE (scm_f32vector_length, "f32vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f32vector_ref, "f32vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_f32vector_ref, "f32vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -1876,7 +1876,7 @@ SCM_DEFINE (scm_f32vector_ref, "f32vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f32vector_set_x, "f32vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_f32vector_set_x, "f32vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -1910,7 +1910,7 @@ SCM_DEFINE (scm_f32vector_set_x, "f32vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f32vector_to_list, "f32vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_f32vector_to_list, "f32vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_f32vector_to_list
@@ -1976,7 +1976,7 @@ SCM_DEFINE (scm_list_to_f32vector, "list->f32vector", 1, 0, 0,
 /* ================================================================ */
 
 
-SCM_DEFINE (scm_f64vector_p, "f64vector?", 1, 0, 0, 
+SCM_DEFINE (scm_f64vector_p, "f64vector?", 1, 0, 0,
             (SCM obj),
            "Return @code{#t} if @var{obj} is a vector of type f64,\n"
            "@code{#f} otherwise.")
@@ -1988,7 +1988,7 @@ SCM_DEFINE (scm_f64vector_p, "f64vector?", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_make_f64vector, "make-f64vector", 1, 1, 0, 
+SCM_DEFINE (scm_make_f64vector, "make-f64vector", 1, 1, 0,
             (SCM n, SCM fill),
            "Create a newly allocated homogeneous numeric vector which can\n"
            "hold @var{len} elements.  If @var{fill} is given, it is used to\n"
@@ -2016,7 +2016,7 @@ SCM_DEFINE (scm_make_f64vector, "make-f64vector", 1, 1, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f64vector, "f64vector", 0, 0, 1, 
+SCM_DEFINE (scm_f64vector, "f64vector", 0, 0, 1,
             (SCM l),
            "Create a newly allocated homogeneous numeric vector containing\n"
            "all argument values.")
@@ -2028,7 +2028,7 @@ SCM_DEFINE (scm_f64vector, "f64vector", 0, 0, 1,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f64vector_length, "f64vector-length", 1, 0, 0, 
+SCM_DEFINE (scm_f64vector_length, "f64vector-length", 1, 0, 0,
             (SCM uvec),
            "Return the number of elements in the homogeneous numeric vector\n"
            "@var{uvec}.")
@@ -2042,7 +2042,7 @@ SCM_DEFINE (scm_f64vector_length, "f64vector-length", 1, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f64vector_ref, "f64vector-ref", 2, 0, 0, 
+SCM_DEFINE (scm_f64vector_ref, "f64vector-ref", 2, 0, 0,
             (SCM uvec, SCM index),
            "Return the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec}.")
@@ -2063,7 +2063,7 @@ SCM_DEFINE (scm_f64vector_ref, "f64vector-ref", 2, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f64vector_set_x, "f64vector-set!", 3, 0, 0, 
+SCM_DEFINE (scm_f64vector_set_x, "f64vector-set!", 3, 0, 0,
             (SCM uvec, SCM index, SCM value),
            "Set the element at @var{index} in the homogeneous numeric\n"
            "vector @var{uvec} to @var{value}.  The return value is not\n"
@@ -2089,7 +2089,7 @@ SCM_DEFINE (scm_f64vector_set_x, "f64vector-set!", 3, 0, 0,
 #undef FUNC_NAME
 
 
-SCM_DEFINE (scm_f64vector_to_list, "f64vector->list", 1, 0, 0, 
+SCM_DEFINE (scm_f64vector_to_list, "f64vector->list", 1, 0, 0,
             (SCM uvec),
            "Convert the homogeneous numeric vector @var{uvec} to a list.")
 #define FUNC_NAME s_scm_f64vector_to_list
@@ -2149,9 +2149,7 @@ scm_init_srfi_4 (void)
   scm_tc16_uvec = scm_make_smob_type ("uvec", 0);
   scm_set_smob_free (scm_tc16_uvec, uvec_free);
   scm_set_smob_print (scm_tc16_uvec, uvec_print);
-#ifndef SCM_MAGIC_SNARFER
 #include "srfi/srfi-4.x"
-#endif
 }
 
 /* End of srfi-4.c.  */