diff options
author | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2001-08-31 09:16:23 +0000 |
---|---|---|
committer | Dirk Herrmann <dirk@dirk-herrmanns-seiten.de> | 2001-08-31 09:16:23 +0000 |
commit | f7c6b7788674a3fdf68875e59fe0ab51c9fc2907 (patch) | |
tree | c273024a77ee3b01895f96171e0750314899158f | |
parent | e09c8eb74751b838416959e734f290f4867f47d7 (diff) | |
download | guile-f7c6b7788674a3fdf68875e59fe0ab51c9fc2907.tar.gz |
* Removed deprecated definitions.
* Minor cleanups.
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | libguile.h | 75 |
2 files changed, 19 insertions, 63 deletions
@@ -1,3 +1,10 @@ +2001-08-31 Dirk Herrmann <D.Herrmann@tu-bs.de> + + * libguile.h: Removed bogus comment, rearranged includes, removed + deprecated definitions. + + (LIBGUILEH, SCM_LIBGUILE_H): Renamed <foo>H to SCM_<foo>_H. + 2001-08-30 Thien-Thi Nguyen <ttn@revel.glug.org> * HACKING: Mention libtool ./configure-regeneration requirement. diff --git a/libguile.h b/libguile.h index cb7d3bfca..c184776e2 100644 --- a/libguile.h +++ b/libguile.h @@ -1,7 +1,7 @@ -#ifndef LIBGUILEH -#define LIBGUILEH +#ifndef SCM_LIBGUILE_H +#define SCM_LIBGUILE_H -/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,2000,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 @@ -48,24 +48,12 @@ extern "C" { #endif #include "libguile/__scm.h" - -/* These files define typedefs used by later files, so they need to - come first. */ -#include "libguile/print.h" -#include "libguile/smob.h" -#include "libguile/pairs.h" - #include "libguile/alist.h" #include "libguile/arbiters.h" #include "libguile/async.h" #include "libguile/boolean.h" #include "libguile/chars.h" #include "libguile/continuations.h" -#ifdef DEBUG_EXTENSIONS -#include "libguile/backtrace.h" -#include "libguile/debug.h" -#include "libguile/stacks.h" -#endif #include "libguile/dynl.h" #include "libguile/dynwind.h" #include "libguile/eq.h" @@ -98,8 +86,10 @@ extern "C" { #include "libguile/objects.h" #include "libguile/objprop.h" #include "libguile/options.h" +#include "libguile/pairs.h" #include "libguile/ports.h" #include "libguile/posix.h" +#include "libguile/print.h" #include "libguile/procprop.h" #include "libguile/properties.h" #include "libguile/procs.h" @@ -110,6 +100,7 @@ extern "C" { #include "libguile/scmsigs.h" #include "libguile/script.h" #include "libguile/simpos.h" +#include "libguile/smob.h" #include "libguile/snarf.h" #include "libguile/socket.h" #include "libguile/sort.h" @@ -132,64 +123,22 @@ extern "C" { #include "libguile/version.h" #include "libguile/vports.h" #include "libguile/weaks.h" -#ifdef USE_THREADS -#include "libguile/threads.h" +#ifdef DEBUG_EXTENSIONS +#include "libguile/backtrace.h" +#include "libguile/debug.h" +#include "libguile/stacks.h" #endif - -/* Deprecated type names. Don't use them for new code. */ - -#if SCM_DEBUG_DEPRECATED == 0 - -typedef scm_t_array_dim scm_array_dim_t; -typedef scm_t_array scm_array_t; -typedef scm_t_bits scm_bits_t; -typedef scm_t_c_bvec_limb scm_c_bvec_limb_t; -typedef scm_t_c_hook_entry scm_c_hook_entry_t; -typedef scm_t_c_hook_function scm_c_hook_function_t; -typedef scm_t_c_hook scm_c_hook_t; -typedef scm_t_catch_body scm_catch_body_t; -typedef scm_t_catch_handler scm_catch_handler_t; -typedef scm_t_complex scm_complex_t; -typedef scm_t_contregs scm_contregs_t; -typedef scm_t_debug_frame scm_debug_frame_t; -typedef scm_t_debug_info scm_debug_info_t; -typedef scm_t_double scm_double_t; -typedef scm_t_fport scm_fport_t; -typedef scm_t_guard scm_guard_t; -typedef scm_t_i_rstate scm_i_rstate_t; -typedef scm_t_info_frame scm_info_frame_t; -typedef scm_t_inner scm_inner_t; -typedef scm_t_method scm_method_t; -typedef scm_t_option scm_option_t; -typedef scm_t_port_rw_active scm_port_rw_active_t; -typedef scm_t_port scm_port_t; -typedef scm_t_ptob_descriptor scm_ptob_descriptor_t; -typedef scm_t_rng scm_rng_t; -typedef scm_t_rstate scm_rstate_t; -typedef scm_t_signed_bits scm_signed_bits_t; -typedef scm_t_srcprops_chunk scm_srcprops_chunk_t; -typedef scm_t_srcprops scm_srcprops_t; -typedef scm_t_stack scm_stack_t; -typedef scm_t_struct_free scm_struct_free_t; -typedef scm_t_subr_entry scm_subr_entry_t; - #ifdef USE_THREADS - -typedef scm_t_cond scm_cond_t; -typedef scm_t_key scm_key_t; -typedef scm_t_mutex scm_mutex_t; - +#include "libguile/threads.h" #endif -#endif /* !SCM_DEBUG_DEPRECATED */ - #ifdef __cplusplus } #endif -#endif /* LIBGUILEH */ +#endif /* SCM_LIBGUILE_H */ /* Local Variables: |