The FSF has a new address.

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

diff --git a/libguile/gh_funcs.c b/libguile/gh_funcs.c
index 676d1cd..c789ce0 100644 (file)
--- a/libguile/gh_funcs.c
+++ b/libguile/gh_funcs.c
@@ -1,50 +1,24 @@
-/*      Copyright (C) 1995,1996,1997,1998 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,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
+/*      Copyright (C) 1995,1996,1997,1998, 2000, 2001 Free Software Foundation, Inc.
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE.  If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
+ * This library 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
+ * Lesser General Public License for more details.
  *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.  */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 \f
 
 \f
 /* Defining Scheme functions implemented by C functions --- subrs.  */
 
-#include <stdio.h>
-
 #include "libguile/gh.h"
 
 /* allows you to define new scheme primitives written in C */
@@ -52,8 +26,8 @@ SCM
 gh_new_procedure (const char *proc_name, SCM (*fn) (),
                  int n_required_args, int n_optional_args, int varp)
 {
-  return scm_make_gsubr (proc_name, n_required_args, n_optional_args,
-                        varp, fn);
+  return scm_c_define_gsubr (proc_name, n_required_args, n_optional_args,
+                            varp, fn);
 }
 
 SCM
@@ -132,7 +106,8 @@ gh_new_procedure5_0 (const char *proc_name, SCM (*fn) ())
 SCM
 gh_define (const char *name, SCM val)
 {
-  return scm_sysintern (name, val);
+  scm_c_define (name, val);
+  return SCM_UNSPECIFIED;
 }
 
 \f