The FSF has a new address.

[bpt/guile.git] / libguile / win32-dirent.c

diff --git a/libguile/win32-dirent.c b/libguile/win32-dirent.c
index c3bdd43..fca84ae 100644 (file)
--- a/libguile/win32-dirent.c
+++ b/libguile/win32-dirent.c
@@ -1,43 +1,19 @@
 /* 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.
+ * 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.
  *
- * 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 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
+ */
 
 #include "libguile/__scm.h"
 
@@ -57,7 +33,7 @@ opendir (const char * name)
 
   if (!name || !*name) 
     return NULL;
-  file = scm_malloc (strlen (name) + 3);
+  file = malloc (strlen (name) + 3);
   strcpy (file, name);
   if (file[strlen (name) - 1] != '/' && file[strlen (name) - 1] != '\\')
     strcat (file, "/*");
@@ -70,10 +46,10 @@ opendir (const char * name)
       return NULL;
     }
 
-  dir = scm_malloc (sizeof (DIR));
+  dir = malloc (sizeof (DIR));
   dir->mask = file;
   dir->fd = (int) hnd;
-  dir->data = scm_malloc (sizeof (WIN32_FIND_DATA));
+  dir->data = malloc (sizeof (WIN32_FIND_DATA));
   dir->allocation = sizeof (WIN32_FIND_DATA);
   dir->size = dir->allocation;
   dir->filepos = 0;