diff --git a/libguile.h b/libguile.h index 073605c19..dbcae11e9 100644 --- a/libguile.h +++ b/libguile.h @@ -71,7 +71,6 @@ extern "C" { #include "libguile/list.h" #include "libguile/load.h" #include "libguile/macros.h" -#include "libguile/mallocs.h" #include "libguile/modules.h" #include "libguile/net_db.h" #include "libguile/numbers.h" diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 9a6925f4e..c9f792467 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -189,7 +189,6 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = \ load.c \ loader.c \ macros.c \ - mallocs.c \ memoize.c \ modules.c \ null-threads.c \ @@ -298,7 +297,6 @@ DOT_X_FILES = \ load.x \ loader.x \ macros.x \ - mallocs.x \ memoize.x \ modules.x \ numbers.x \ @@ -393,7 +391,6 @@ DOT_DOC_FILES = \ list.doc \ load.doc \ macros.doc \ - mallocs.doc \ memoize.doc \ modules.doc \ numbers.doc \ @@ -641,7 +638,6 @@ modinclude_HEADERS = \ load.h \ loader.h \ macros.h \ - mallocs.h \ memoize.h \ modules.h \ net_db.h \ diff --git a/libguile/init.c b/libguile/init.c index 768abefb9..29a3dbc43 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -92,7 +92,6 @@ #include "load.h" #include "loader.h" #include "macros.h" -#include "mallocs.h" #include "memoize.h" #include "modules.h" #include "net_db.h" @@ -405,7 +404,6 @@ scm_i_init_guile (struct gc_stack_addr base) scm_init_list (); scm_init_random (); /* Requires smob_prehistory */ scm_init_macros (); /* Requires smob_prehistory and random */ - scm_init_mallocs (); /* Requires smob_prehistory */ scm_init_modules (); /* Requires smob_prehistory */ scm_init_numbers (); scm_init_options (); diff --git a/libguile/mallocs.c b/libguile/mallocs.c deleted file mode 100644 index fefa82925..000000000 --- a/libguile/mallocs.c +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright 1995-1998,2000-2001,2006,2011,2014,2018 - Free Software Foundation, Inc. - - This file is part of Guile. - - Guile 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. - - Guile 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 Guile. If not, see - . */ - - - - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include - -#include "ports.h" -#include "smob.h" - -#include "mallocs.h" - - - -scm_t_bits scm_tc16_malloc; - - - -static int -malloc_print (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED) -{ - scm_puts ("#', port); - return 1; -} - - -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); -} - - - -void -scm_init_mallocs () -{ - scm_tc16_malloc = scm_make_smob_type ("malloc", 0); - scm_set_smob_print (scm_tc16_malloc, malloc_print); -} diff --git a/libguile/mallocs.h b/libguile/mallocs.h deleted file mode 100644 index beb807380..000000000 --- a/libguile/mallocs.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef SCM_MALLOCS_H -#define SCM_MALLOCS_H - -/* Copyright 1995,2000,2006,2008,2018 - Free Software Foundation, Inc. - - This file is part of Guile. - - Guile 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. - - Guile 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 Guile. If not, see - . */ - - - -#include "libguile/scm.h" - - -SCM_API scm_t_bits scm_tc16_malloc; - -#define SCM_MALLOCP(X) (SCM_SMOB_PREDICATE (scm_tc16_malloc, (X))) -#define SCM_MALLOCDATA(obj) ((char *) SCM_SMOB_DATA (obj)) -#define SCM_SETMALLOCDATA(obj, val) (SCM_SET_SMOB_DATA ((obj), (val))) - - - -SCM_API SCM scm_malloc_obj (size_t n); -SCM_INTERNAL void scm_init_mallocs (void); - -#endif /* SCM_MALLOCS_H */ diff --git a/libguile/options.c b/libguile/options.c index 937fd4f3b..32db66054 100644 --- a/libguile/options.c +++ b/libguile/options.c @@ -1,4 +1,4 @@ -/* Copyright 1995-1996,1998,2000-2001,2006,2008-2011,2018 +/* Copyright 1995-1996,1998,2000-2001,2006,2008-2011,2018,2025 Free Software Foundation, Inc. This file is part of Guile. @@ -24,7 +24,6 @@ #include "boolean.h" #include "list.h" -#include "mallocs.h" #include "numbers.h" #include "pairs.h" #include "strings.h" diff --git a/libguile/ports.c b/libguile/ports.c index 83634eccc..54fec74d1 100644 --- a/libguile/ports.c +++ b/libguile/ports.c @@ -64,7 +64,6 @@ #include "gsubr.h" #include "hashtab.h" #include "keywords.h" -#include "mallocs.h" #include "modules.h" #include "numbers.h" #include "pairs.h"