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
dissimilarity index 82%
index ebc294d..de11972 100644 (file)
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -1,92 +1,76 @@
-/* classes: src_files 
- *     Copyright (C) 1995, 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 */
-
-/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
-   gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
-
-
-\f
-
-#include <stdio.h>
-#include "_scm.h"
-#include "genio.h"
-#include "smob.h"
-
-#include "mallocs.h"
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-
-\f
-
-
-
-static scm_sizet
-fmalloc(SCM ptr)
-{
-  if (SCM_MALLOCDATA (ptr))
-    free (SCM_MALLOCDATA (ptr));
-  return 0;
-}
-
-
-static int
-prinmalloc (SCM exp,SCM port,scm_print_state *pstate)
-{
-  scm_puts("#<malloc ", port);
-  scm_intprint(SCM_CDR(exp), 16, port);
-  scm_putc('>', port);
-  return 1;
-}
-
-\f
-int scm_tc16_malloc;
-\f
-
-
-SCM
-scm_malloc_obj (n)
-     scm_sizet n;
-{
-  SCM mem;
-
-  mem = (n
-        ? (SCM)malloc (n)
-        : 0);
-  if (n && !mem)
-    {
-      SCM_ALLOW_INTS;
-      return SCM_BOOL_F;
-    }
-  SCM_RETURN_NEWSMOB (scm_tc16_malloc, mem);
-}
-
-
-\f
-
-void 
-scm_init_mallocs ()
-{
-  scm_tc16_malloc = scm_make_smob_type_mfpe ("malloc", 0,
-                                            NULL, fmalloc, prinmalloc, NULL);
-}
+/* classes: src_files 
+ * 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 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
+ * 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
+ */
+
+
+
+\f
+#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"
+
+#include <unistd.h>
+
+
+\f
+scm_t_bits scm_tc16_malloc;
+
+
+
+static int
+malloc_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
+{
+  scm_puts("#<malloc ", port);
+  scm_uintprint (SCM_SMOB_DATA (exp), 16, port);
+  scm_putc('>', port);
+  return 1;
+}
+
+\f
+SCM
+scm_malloc_obj (size_t n)
+{
+  scm_t_bits mem = n ? (scm_t_bits) scm_gc_malloc (n, "malloc smob") : 0;
+  if (n && !mem)
+    return SCM_BOOL_F;
+  SCM_RETURN_NEWSMOB (scm_tc16_malloc, mem);
+}
+
+
+\f
+void
+scm_init_mallocs ()
+{
+  scm_tc16_malloc = scm_make_smob_type ("malloc", 0);
+  scm_set_smob_print (scm_tc16_malloc, malloc_print);
+}
+
+/*
+  Local Variables:
+  c-file-style: "gnu"
+  End:
+*/