build: Don't include <config.h> in native programs when cross-compiling.

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

diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index 6a68b96..de11972 100644 (file)
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -1,54 +1,45 @@
 /* classes: src_files 
- * Copyright (C) 1995,1997,1998,2000,2001, 2006 Free Software Foundation, Inc.
+ * Copyright (C) 1995,1997,1998,2000,2001, 2006,
+ *   2014 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.
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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.
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
  */
 
 
 
 \f
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
 
+#include <stdlib.h>
+
 #include "libguile/_scm.h"
 #include "libguile/ports.h"
 #include "libguile/smob.h"
 
 #include "libguile/mallocs.h"
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 
 \f
 scm_t_bits scm_tc16_malloc;
 
 
-static size_t
-malloc_free (SCM ptr)
-{
-  if (SCM_MALLOCDATA (ptr))
-    free (SCM_MALLOCDATA (ptr));
-  return 0;
-}
-
 
 static int
 malloc_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
@@ -71,11 +62,10 @@ scm_malloc_obj (size_t n)
 
 
 \f
-void 
+void
 scm_init_mallocs ()
 {
   scm_tc16_malloc = scm_make_smob_type ("malloc", 0);
-  scm_set_smob_free (scm_tc16_malloc, malloc_free);
   scm_set_smob_print (scm_tc16_malloc, malloc_print);
 }