(environ): Use _NSGetEnviron in Darwin

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

diff --git a/libguile/extensions.c b/libguile/extensions.c
index 5200eb4..61948a8 100644 (file)
--- a/libguile/extensions.c
+++ b/libguile/extensions.c
@@ -2,44 +2,24 @@
  *
  * 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,
- * 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.
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
 
 #include <string.h>
 
@@ -74,13 +54,12 @@ void
 scm_c_register_extension (const char *lib, const char *init,
                          void (*func) (void *), void *data)
 {
-  extension_t *ext = scm_must_malloc (sizeof(extension_t),
-                                          "scm_register_extension");
+  extension_t *ext = scm_malloc (sizeof(extension_t));
   if (lib)
-    ext->lib = scm_must_strdup (lib);
+    ext->lib = scm_strdup (lib);
   else
     ext->lib = NULL;
-  ext->init = scm_must_strdup (init);
+  ext->init = scm_strdup (init);
   ext->func = func;
   ext->data = data;
 
@@ -105,7 +84,6 @@ load_extension (SCM lib, SCM init)
   }
 
   /* Dynamically link the library. */
-
   scm_dynamic_call (init, scm_dynamic_link (lib));
 }
 
@@ -164,9 +142,7 @@ void
 scm_init_extensions ()
 {
   registered_extensions = NULL;
-#ifndef SCM_MAGIC_SNARFER
 #include "libguile/extensions.x"
-#endif
 }
 
 /*