Use `SCM_DEPRECATED' in declarations of deprecated functions/variables.

* libguile/deprecated.c (SCM_BUILDING_DEPRECATED_CODE): New macro.

* libguile/async.c (SCM_BUILDING_DEPRECATED_CODE): Likewise.

* libguile/macros.c (SCM_BUILDING_DEPRECATED_CODE): Likewise.

* libguile/async.h, libguile/deprecated.h, libguile/eval.h,
  libguile/gc.h, libguile/gc.h, libguile/macros.h, libguile/ports.h,
  libguile/srfi-4.h, libguile/strings.h: Change declarations of
  deprecated functions and variables to use `SCM_DEPRECATED' instead of
  `SCM_API'.

diff --git a/libguile/async.c b/libguile/async.c
index 3e5a581..948aefa 100644 (file)
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2006, 2008, 2009 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
@@ -22,6 +22,8 @@
 #  include <config.h>
 #endif
 
+#define SCM_BUILDING_DEPRECATED_CODE
+
 #include <signal.h>
 #include "libguile/_scm.h"
 #include "libguile/eval.h"

diff --git a/libguile/async.h b/libguile/async.h
index b9b795f..ba6c77c 100644 (file)
--- a/libguile/async.h
+++ b/libguile/async.h
@@ -3,7 +3,7 @@
 #ifndef SCM_ASYNC_H
 #define SCM_ASYNC_H
 
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2005, 2006, 2008, 2009 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
@@ -81,9 +81,9 @@ SCM_INTERNAL void scm_init_async (void);
 
 #if (SCM_ENABLE_DEPRECATED == 1)
 
-SCM_API SCM scm_system_async (SCM thunk);
-SCM_API SCM scm_unmask_signals (void);
-SCM_API SCM scm_mask_signals (void);
+SCM_DEPRECATED SCM scm_system_async (SCM thunk);
+SCM_DEPRECATED SCM scm_unmask_signals (void);
+SCM_DEPRECATED SCM scm_mask_signals (void);
 
 #endif
 

diff --git a/libguile/deprecated.c b/libguile/deprecated.c
index 1b9e581..a8aebee 100644 (file)
--- a/libguile/deprecated.c
+++ b/libguile/deprecated.c
@@ -24,6 +24,8 @@
 # include <config.h>
 #endif
 
+#define SCM_BUILDING_DEPRECATED_CODE
+
 #include "libguile/_scm.h"
 #include "libguile/async.h"
 #include "libguile/deprecated.h"

diff --git a/libguile/deprecated.h b/libguile/deprecated.h
index 18424d5..93738f1 100644 (file)
--- a/libguile/deprecated.h
+++ b/libguile/deprecated.h
@@ -67,13 +67,13 @@ SCM_API char *scm_isymnames[];
 
 /* From eval.h: Error messages of the evaluator.  These were deprecated in
  * guile 1.7.0 on 2003-06-02.  */
-SCM_API const char scm_s_expression[];
-SCM_API const char scm_s_test[];
-SCM_API const char scm_s_body[];
-SCM_API const char scm_s_bindings[];
-SCM_API const char scm_s_variable[];
-SCM_API const char scm_s_clauses[];
-SCM_API const char scm_s_formals[];
+SCM_DEPRECATED const char scm_s_expression[];
+SCM_DEPRECATED const char scm_s_test[];
+SCM_DEPRECATED const char scm_s_body[];
+SCM_DEPRECATED const char scm_s_bindings[];
+SCM_DEPRECATED const char scm_s_variable[];
+SCM_DEPRECATED const char scm_s_clauses[];
+SCM_DEPRECATED const char scm_s_formals[];
 
 
 /* From eval.h: Helper macros for evaluation and application.  These were
@@ -97,18 +97,18 @@ SCM_API const char scm_s_formals[];
 
 #define scm_sizet size_t
 
-SCM_API SCM scm_wta (SCM arg, const char *pos, const char *s_subr);
+SCM_DEPRECATED SCM scm_wta (SCM arg, const char *pos, const char *s_subr);
 
 #define SCM_WNA                8
 #define SCM_OUTOFRANGE         10
 #define SCM_NALLOC             11
 
-SCM_API void scm_register_module_xxx (char *module_name, void *init_func);
-SCM_API SCM scm_registered_modules (void);
-SCM_API SCM scm_clear_registered_modules (void);
+SCM_DEPRECATED void scm_register_module_xxx (char *module_name, void *init_func);
+SCM_DEPRECATED SCM scm_registered_modules (void);
+SCM_DEPRECATED SCM scm_clear_registered_modules (void);
 
-SCM_API SCM scm_protect_object (SCM obj);
-SCM_API SCM scm_unprotect_object (SCM obj);
+SCM_DEPRECATED SCM scm_protect_object (SCM obj);
+SCM_DEPRECATED SCM scm_unprotect_object (SCM obj);
 
 #define SCM_SETAND_CAR(x, y) \
   (SCM_SETCAR ((x), SCM_PACK (SCM_UNPACK (SCM_CAR (x)) & (y))))
@@ -125,18 +125,18 @@ SCM_API SCM scm_unprotect_object (SCM obj);
 #define SCM_CLRGC8MARK(x) SCM_CLEAR_GC_MARK (x)
 #define SCM_GCTYP16(x) SCM_TYP16 (x)
 #define SCM_GCCDR(x) SCM_CDR (x)
-SCM_API void scm_remember (SCM * ptr);
+SCM_DEPRECATED void scm_remember (SCM * ptr);
 
-SCM_API SCM scm_the_root_module (void);
-SCM_API SCM scm_make_module (SCM name);
-SCM_API SCM scm_ensure_user_module (SCM name);
-SCM_API SCM scm_load_scheme_module (SCM name);
+SCM_DEPRECATED SCM scm_the_root_module (void);
+SCM_DEPRECATED SCM scm_make_module (SCM name);
+SCM_DEPRECATED SCM scm_ensure_user_module (SCM name);
+SCM_DEPRECATED SCM scm_load_scheme_module (SCM name);
 
 #define scm_port scm_t_port
 #define scm_ptob_descriptor scm_t_ptob_descriptor
 #define scm_port_rw_active scm_t_port_rw_active
 
-SCM_API SCM scm_close_all_ports_except (SCM ports);
+SCM_DEPRECATED SCM scm_close_all_ports_except (SCM ports);
 
 #define scm_rstate scm_t_rstate
 #define scm_rng scm_t_rng
@@ -148,25 +148,27 @@ SCM_API SCM scm_close_all_ports_except (SCM ports);
 #define scm_tc7_msymbol                scm_tc7_symbol
 #define scm_tcs_symbols         scm_tc7_symbol
 
-SCM_API SCM scm_makstr (size_t len, int);
-SCM_API SCM scm_makfromstr (const char *src, size_t len, int);
+SCM_DEPRECATED SCM scm_makstr (size_t len, int);
+SCM_DEPRECATED SCM scm_makfromstr (const char *src, size_t len, int);
 
-SCM_API SCM scm_variable_set_name_hint (SCM var, SCM hint);
-SCM_API SCM scm_builtin_variable (SCM name);
+SCM_DEPRECATED SCM scm_variable_set_name_hint (SCM var, SCM hint);
+SCM_DEPRECATED SCM scm_builtin_variable (SCM name);
 
-SCM_API SCM scm_internal_with_fluids (SCM fluids, SCM vals,
-                                     SCM (*cproc)(void *), void *cdata);
+SCM_DEPRECATED SCM scm_internal_with_fluids (SCM fluids, SCM vals,
+                                            SCM (*cproc)(void *),
+                                            void *cdata);
 
-SCM_API SCM scm_make_gsubr (const char *name, int req, int opt, int rst,
-                           SCM (*fcn)());
-SCM_API SCM scm_make_gsubr_with_generic (const char *name,
-                                        int req,
-                                        int opt,
-                                        int rst,
-                                        SCM (*fcn)(),
-                                        SCM *gf);
+SCM_DEPRECATED SCM scm_make_gsubr (const char *name,
+                                  int req, int opt, int rst,
+                                  SCM (*fcn)());
+SCM_DEPRECATED SCM scm_make_gsubr_with_generic (const char *name,
+                                               int req,
+                                               int opt,
+                                               int rst,
+                                               SCM (*fcn)(),
+                                               SCM *gf);
 
-SCM_API SCM scm_create_hook (const char* name, int n_args);
+SCM_DEPRECATED SCM scm_create_hook (const char* name, int n_args);
 
 #define SCM_LIST0 SCM_EOL
 #define SCM_LIST1(e0) scm_cons ((e0), SCM_EOL)
@@ -188,78 +190,78 @@ SCM_API SCM scm_create_hook (const char* name, int n_args);
 
 #define scm_listify scm_list_n
 
-SCM_API SCM scm_sloppy_memq (SCM x, SCM lst);
-SCM_API SCM scm_sloppy_memv (SCM x, SCM lst);
-SCM_API SCM scm_sloppy_member (SCM x, SCM lst);
+SCM_DEPRECATED SCM scm_sloppy_memq (SCM x, SCM lst);
+SCM_DEPRECATED SCM scm_sloppy_memv (SCM x, SCM lst);
+SCM_DEPRECATED SCM scm_sloppy_member (SCM x, SCM lst);
 
-SCM_API SCM scm_read_and_eval_x (SCM port);
+SCM_DEPRECATED SCM scm_read_and_eval_x (SCM port);
 
 #define scm_subr_entry scm_t_subr_entry
 
 #define SCM_SUBR_DOC(x) SCM_BOOL_F
 
-SCM_API SCM scm_make_subr (const char *name, int type, SCM (*fcn) ());
-SCM_API SCM scm_make_subr_with_generic (const char *name,
-                                       int type,
-                                       SCM (*fcn) (),
-                                       SCM *gf);
-SCM_API SCM scm_make_subr_opt (const char *name, 
-                              int type, 
-                              SCM (*fcn) (),
-                              int set);
+SCM_DEPRECATED SCM scm_make_subr (const char *name, int type, SCM (*fcn) ());
+SCM_DEPRECATED SCM scm_make_subr_with_generic (const char *name,
+                                              int type,
+                                              SCM (*fcn) (),
+                                              SCM *gf);
+SCM_DEPRECATED SCM scm_make_subr_opt (const char *name,
+                                     int type,
+                                     SCM (*fcn) (),
+                                     int set);
 
-SCM_API SCM scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(),
-                                     void * closure);
+SCM_DEPRECATED SCM scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(),
+                                            void * closure);
 
-SCM_API long scm_make_smob_type_mfpe (char *name, size_t size,
-                                     SCM (*mark) (SCM),
-                                     size_t (*free) (SCM),
-                                     int (*print) (SCM, SCM,
-                                                   scm_print_state*),
-                                     SCM (*equalp) (SCM, SCM));
+SCM_DEPRECATED long scm_make_smob_type_mfpe (char *name, size_t size,
+                                            SCM (*mark) (SCM),
+                                            size_t (*free) (SCM),
+                                            int (*print) (SCM, SCM,
+                                                          scm_print_state*),
+                                            SCM (*equalp) (SCM, SCM));
 
-SCM_API void scm_set_smob_mfpe (long tc, 
-                               SCM (*mark) (SCM),
-                               size_t (*free) (SCM),
-                               int (*print) (SCM, SCM, scm_print_state*),
-                               SCM (*equalp) (SCM, SCM));
+SCM_DEPRECATED void scm_set_smob_mfpe (long tc,
+                                      SCM (*mark) (SCM),
+                                      size_t (*free) (SCM),
+                                      int (*print) (SCM, SCM, scm_print_state*),
+                                      SCM (*equalp) (SCM, SCM));
 
-SCM_API size_t scm_smob_free (SCM obj);
+SCM_DEPRECATED size_t scm_smob_free (SCM obj);
 
-SCM_API SCM scm_strprint_obj (SCM obj);
-SCM_API SCM scm_read_0str (char *expr);
-SCM_API SCM scm_eval_0str (const char *expr);
+SCM_DEPRECATED SCM scm_strprint_obj (SCM obj);
+SCM_DEPRECATED SCM scm_read_0str (char *expr);
+SCM_DEPRECATED SCM scm_eval_0str (const char *expr);
 
-SCM_API char *scm_i_object_chars (SCM);
+SCM_DEPRECATED char *scm_i_object_chars (SCM);
 
 #define SCM_CHARS(x)   scm_i_object_chars(x)
 #define SCM_UCHARS(x)  ((unsigned char *)SCM_CHARS(x))
 
-SCM_API long scm_i_object_length (SCM);
+SCM_DEPRECATED long scm_i_object_length (SCM);
 
 #define SCM_LENGTH(x) scm_i_object_length(x)
 
 #define scm_strhash(str, len, n) (scm_string_hash ((str), (len)) % (n))
 
-SCM_API SCM scm_sym2ovcell_soft (SCM sym, SCM obarray);
-SCM_API SCM scm_sym2ovcell (SCM sym, SCM obarray);
-SCM_API SCM scm_intern_obarray_soft (const char *name, size_t len,
+SCM_DEPRECATED SCM scm_sym2ovcell_soft (SCM sym, SCM obarray);
+SCM_DEPRECATED SCM scm_sym2ovcell (SCM sym, SCM obarray);
+SCM_DEPRECATED SCM scm_intern_obarray_soft (const char *name, size_t len,
                                     SCM obarray, unsigned int softness);
-SCM_API SCM scm_intern_obarray (const char *name, size_t len, SCM obarray);
-SCM_API SCM scm_symbol_value0 (const char *name);
+SCM_DEPRECATED SCM scm_intern_obarray (const char *name, size_t len, SCM obarray);
+SCM_DEPRECATED SCM scm_symbol_value0 (const char *name);
 
-SCM_API SCM scm_string_to_obarray_symbol (SCM o, SCM s, SCM softp);
-SCM_API SCM scm_intern_symbol (SCM o, SCM s);
-SCM_API SCM scm_unintern_symbol (SCM o, SCM s);
-SCM_API SCM scm_symbol_binding (SCM o, SCM s);
+SCM_DEPRECATED SCM scm_string_to_obarray_symbol (SCM o, SCM s, SCM softp);
+SCM_DEPRECATED SCM scm_intern_symbol (SCM o, SCM s);
+SCM_DEPRECATED SCM scm_unintern_symbol (SCM o, SCM s);
+SCM_DEPRECATED SCM scm_symbol_binding (SCM o, SCM s);
 #if 0
 /* This name has been reused for real uninterned symbols. */
-SCM_API SCM scm_symbol_interned_p (SCM o, SCM s);
+SCM_DEPRECATED SCM scm_symbol_interned_p (SCM o, SCM s);
 #endif
-SCM_API SCM scm_symbol_bound_p (SCM o, SCM s);
-SCM_API SCM scm_symbol_set_x (SCM o, SCM s, SCM v);
+SCM_DEPRECATED SCM scm_symbol_bound_p (SCM o, SCM s);
+SCM_DEPRECATED SCM scm_symbol_set_x (SCM o, SCM s, SCM v);
 
-SCM_API SCM scm_gentemp (SCM prefix, SCM obarray);
+SCM_DEPRECATED SCM scm_gentemp (SCM prefix, SCM obarray);
 
 #define SCM_OPDIRP(x) (SCM_DIRP (x) && (SCM_DIR_OPEN_P (x)))
 #define scm_fport scm_t_fport
@@ -312,9 +314,9 @@ SCM_API SCM scm_gentemp (SCM prefix, SCM obarray);
 /* Users shouldn't know about INUMs.
  */
 
-SCM_API SCM scm_i_makinum (scm_t_signed_bits val);
-SCM_API int scm_i_inump (SCM obj);
-SCM_API scm_t_signed_bits scm_i_inum (SCM obj);
+SCM_DEPRECATED SCM scm_i_makinum (scm_t_signed_bits val);
+SCM_DEPRECATED int scm_i_inump (SCM obj);
+SCM_DEPRECATED scm_t_signed_bits scm_i_inum (SCM obj);
 
 #define SCM_MAKINUM(x)   scm_i_makinum(x)
 #define SCM_INUM(x)      scm_i_inum(x)
@@ -407,7 +409,7 @@ SCM_API scm_t_signed_bits scm_i_inum (SCM obj);
    copies the complete contents of OBJ, and sets *LENP to the length of the
    scheme string (if LENP is non-null).  
 */
-SCM_API char *scm_c_string2str (SCM obj, char *str, size_t *lenp);
+SCM_DEPRECATED char *scm_c_string2str (SCM obj, char *str, size_t *lenp);
 
 /* XXX - buggy interface, you don't know how many bytes have been copied.
 
@@ -419,15 +421,15 @@ SCM_API char *scm_c_string2str (SCM obj, char *str, size_t *lenp);
    region to fit the string.  If truncation occurs, the corresponding
    area of STR is left unchanged.  
 */
-SCM_API char *scm_c_substring2str (SCM obj, char *str, size_t start, size_t len);
+SCM_DEPRECATED char *scm_c_substring2str (SCM obj, char *str, size_t start, size_t len);
 
-SCM_API char *scm_c_symbol2str (SCM obj, char *str, size_t *lenp);
+SCM_DEPRECATED char *scm_c_symbol2str (SCM obj, char *str, size_t *lenp);
 
 /* Deprecated because the names belong to what is now
    scm_truncate_number and scm_round_number.
 */
-SCM_API double scm_truncate (double x);
-SCM_API double scm_round (double x);
+SCM_DEPRECATED double scm_truncate (double x);
+SCM_DEPRECATED double scm_round (double x);
 
 /* Deprecated because we don't want people to access the internal
    representation of strings directly.
@@ -461,8 +463,8 @@ SCM_API double scm_round (double x);
    symbols directly.
 */
 
-SCM_API char *scm_i_deprecated_symbol_chars (SCM sym);
-SCM_API size_t scm_i_deprecated_symbol_length (SCM sym);
+SCM_DEPRECATED char *scm_i_deprecated_symbol_chars (SCM sym);
+SCM_DEPRECATED size_t scm_i_deprecated_symbol_length (SCM sym);
 
 #define SCM_SYMBOL_CHARS(x)  scm_i_deprecated_symbol_chars(x)
 #define SCM_SYMBOL_LENGTH(x) scm_i_deprecated_symbol_length(x)
@@ -471,8 +473,8 @@ SCM_API size_t scm_i_deprecated_symbol_length (SCM sym);
    than once and because the symbol of a keyword now has no dash.
 */
 
-SCM_API int scm_i_keywordp (SCM obj);
-SCM_API SCM scm_i_keywordsym (SCM keyword);
+SCM_DEPRECATED int scm_i_keywordp (SCM obj);
+SCM_DEPRECATED SCM scm_i_keywordsym (SCM keyword);
 
 #define SCM_KEYWORDP(x)   scm_i_keywordp(x)
 #define SCM_KEYWORDSYM(x) scm_i_keywordsym(x)
@@ -482,13 +484,13 @@ SCM_API SCM scm_i_keywordsym (SCM keyword);
 
 #define SCM_VECTOR_MAX_LENGTH ((1L << 24) - 1)
 
-SCM_API int scm_i_vectorp (SCM x);
-SCM_API unsigned long scm_i_vector_length (SCM x);
-SCM_API const SCM *scm_i_velts (SCM x);
-SCM_API SCM *scm_i_writable_velts (SCM x);
-SCM_API SCM scm_i_vector_ref (SCM x, size_t idx);
-SCM_API void scm_i_vector_set (SCM x, size_t idx, SCM val);
-SCM_API SCM scm_vector_equal_p (SCM x, SCM y);
+SCM_DEPRECATED int scm_i_vectorp (SCM x);
+SCM_DEPRECATED unsigned long scm_i_vector_length (SCM x);
+SCM_DEPRECATED const SCM *scm_i_velts (SCM x);
+SCM_DEPRECATED SCM *scm_i_writable_velts (SCM x);
+SCM_DEPRECATED SCM scm_i_vector_ref (SCM x, size_t idx);
+SCM_DEPRECATED void scm_i_vector_set (SCM x, size_t idx, SCM val);
+SCM_DEPRECATED SCM scm_vector_equal_p (SCM x, SCM y);
 
 #define SCM_VECTORP(x)         scm_i_vectorp(x)
 #define SCM_VECTOR_LENGTH(x)   scm_i_vector_length(x)
@@ -499,13 +501,13 @@ SCM_API SCM scm_vector_equal_p (SCM x, SCM y);
 
 typedef scm_i_t_array scm_t_array;
 
-SCM_API int scm_i_arrayp (SCM a);
-SCM_API size_t scm_i_array_ndim (SCM a);
-SCM_API int scm_i_array_contp (SCM a);
-SCM_API scm_t_array *scm_i_array_mem (SCM a);
-SCM_API SCM scm_i_array_v (SCM a);
-SCM_API size_t scm_i_array_base (SCM a);
-SCM_API scm_t_array_dim *scm_i_array_dims (SCM a);
+SCM_DEPRECATED int scm_i_arrayp (SCM a);
+SCM_DEPRECATED size_t scm_i_array_ndim (SCM a);
+SCM_DEPRECATED int scm_i_array_contp (SCM a);
+SCM_DEPRECATED scm_t_array *scm_i_array_mem (SCM a);
+SCM_DEPRECATED SCM scm_i_array_v (SCM a);
+SCM_DEPRECATED size_t scm_i_array_base (SCM a);
+SCM_DEPRECATED scm_t_array_dim *scm_i_array_dims (SCM a);
 
 #define SCM_ARRAYP(a)      scm_i_arrayp(a)
 #define SCM_ARRAY_NDIM(a)  scm_i_array_ndim(a)
@@ -528,19 +530,19 @@ SCM_API scm_t_array_dim *scm_i_array_dims (SCM a);
 #define scm_last_debug_frame  scm_i_deprecated_last_debug_frame ()
 #define scm_stack_base        scm_i_stack_base ()
 
-SCM_API SCM scm_i_cur_inp (void);
-SCM_API SCM scm_i_cur_outp (void);
-SCM_API SCM scm_i_cur_errp (void);
-SCM_API SCM scm_i_cur_loadp (void);
-SCM_API SCM scm_i_progargs (void);
-SCM_API SCM scm_i_deprecated_dynwinds (void);
-SCM_API scm_t_debug_frame *scm_i_deprecated_last_debug_frame (void);
-SCM_API SCM_STACKITEM *scm_i_stack_base (void);
+SCM_DEPRECATED SCM scm_i_cur_inp (void);
+SCM_DEPRECATED SCM scm_i_cur_outp (void);
+SCM_DEPRECATED SCM scm_i_cur_errp (void);
+SCM_DEPRECATED SCM scm_i_cur_loadp (void);
+SCM_DEPRECATED SCM scm_i_progargs (void);
+SCM_DEPRECATED SCM scm_i_deprecated_dynwinds (void);
+SCM_DEPRECATED scm_t_debug_frame *scm_i_deprecated_last_debug_frame (void);
+SCM_DEPRECATED SCM_STACKITEM *scm_i_stack_base (void);
 
 /* Deprecated because it evaluates its argument twice.
  */
 #define SCM_FLUIDP(x) scm_i_fluidp (x)
-SCM_API int scm_i_fluidp (SCM x);
+SCM_DEPRECATED int scm_i_fluidp (SCM x);
 
 /* In the old days, SCM_CRITICAL_SECTION_START stopped signal handlers
    from running, since in those days the handler directly ran scheme
@@ -568,7 +570,7 @@ SCM_API int scm_i_fluidp (SCM x);
    similar DEFER/ALLOW region.
 */
 
-SCM_API void scm_i_defer_ints_etc (void);
+SCM_DEPRECATED void scm_i_defer_ints_etc (void);
 #define SCM_DEFER_INTS scm_i_defer_ints_etc ()
 #define SCM_ALLOW_INTS scm_i_defer_ints_etc ()
 #define SCM_REDEFER_INTS scm_i_defer_ints_etc ()
@@ -576,30 +578,30 @@ SCM_API void scm_i_defer_ints_etc (void);
 
 /* Deprecated since they are unnecessary and had not been documented.
  */
-SCM_API SCM scm_guard (SCM guardian, SCM obj, int throw_p);
-SCM_API SCM scm_get_one_zombie (SCM guardian);
+SCM_DEPRECATED SCM scm_guard (SCM guardian, SCM obj, int throw_p);
+SCM_DEPRECATED SCM scm_get_one_zombie (SCM guardian);
 
 /* Deprecated since guardians no longer have these special features.
  */
-SCM_API SCM scm_destroy_guardian_x (SCM guardian);
-SCM_API SCM scm_guardian_greedy_p (SCM guardian);
-SCM_API SCM scm_guardian_destroyed_p (SCM guardian);
+SCM_DEPRECATED SCM scm_destroy_guardian_x (SCM guardian);
+SCM_DEPRECATED SCM scm_guardian_greedy_p (SCM guardian);
+SCM_DEPRECATED SCM scm_guardian_destroyed_p (SCM guardian);
 
 \f
 /* GC-related things deprecated with the move to BDW-GC starting from 1.9.3
    (2009-09-15).  */
 
-SCM_API unsigned long scm_mallocated;
-SCM_API unsigned long scm_mtrigger;
+SCM_DEPRECATED unsigned long scm_mallocated;
+SCM_DEPRECATED unsigned long scm_mtrigger;
 
-SCM_API size_t scm_max_segment_size;
+SCM_DEPRECATED size_t scm_max_segment_size;
 
 #if defined (GUILE_DEBUG) || defined (GUILE_DEBUG_FREELIST)
-SCM_API SCM scm_map_free_list (void);
+SCM_DEPRECATED SCM scm_map_free_list (void);
 #endif
 
 #if defined (GUILE_DEBUG_FREELIST)
-SCM_API SCM scm_gc_set_debug_check_freelist_x (SCM flag);
+SCM_DEPRECATED SCM scm_gc_set_debug_check_freelist_x (SCM flag);
 #endif
 
 

diff --git a/libguile/eval.h b/libguile/eval.h
index 4467358..522f639 100644 (file)
--- a/libguile/eval.h
+++ b/libguile/eval.h
@@ -157,9 +157,9 @@ SCM_INTERNAL void scm_init_eval (void);
 #if (SCM_ENABLE_DEPRECATED == 1)
 
 /* Deprecated in guile 1.7.0 on 2004-03-29.  */
-SCM_API SCM scm_ceval (SCM x, SCM env);
-SCM_API SCM scm_deval (SCM x, SCM env);
-SCM_API SCM (*scm_ceval_ptr) (SCM x, SCM env);
+SCM_DEPRECATED SCM scm_ceval (SCM x, SCM env);
+SCM_DEPRECATED SCM scm_deval (SCM x, SCM env);
+SCM_DEPRECATED SCM (*scm_ceval_ptr) (SCM x, SCM env);
 
 #endif
 

diff --git a/libguile/gc.h b/libguile/gc.h
index 1f03a78..34c9b84 100644 (file)
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -139,11 +139,11 @@ void *scm_ia64_ar_bsp (const void *);
 \f
 
 #if (SCM_ENABLE_DEPRECATED == 1)
-SCM_API size_t scm_default_init_heap_size_1;
-SCM_API int scm_default_min_yield_1;
-SCM_API size_t scm_default_init_heap_size_2;
-SCM_API int scm_default_min_yield_2;
-SCM_API size_t scm_default_max_segment_size;
+SCM_DEPRECATED size_t scm_default_init_heap_size_1;
+SCM_DEPRECATED int scm_default_min_yield_1;
+SCM_DEPRECATED size_t scm_default_init_heap_size_2;
+SCM_DEPRECATED int scm_default_min_yield_2;
+SCM_DEPRECATED size_t scm_default_max_segment_size;
 #else
 #define  scm_default_init_heap_size_1 deprecated
 #define  scm_default_min_yield_1 deprecated
@@ -243,23 +243,23 @@ SCM_API void scm_init_gc (void);
 
 #if SCM_ENABLE_DEPRECATED == 1
 
-SCM_API SCM scm_deprecated_newcell (void);
-SCM_API SCM scm_deprecated_newcell2 (void);
+SCM_DEPRECATED SCM scm_deprecated_newcell (void);
+SCM_DEPRECATED SCM scm_deprecated_newcell2 (void);
 
 #define SCM_NEWCELL(_into) \
   do { _into = scm_deprecated_newcell (); } while (0)
 #define SCM_NEWCELL2(_into) \
   do { _into = scm_deprecated_newcell2 (); } while (0)
 
-SCM_API void * scm_must_malloc (size_t len, const char *what);
-SCM_API void * scm_must_realloc (void *where,
-                                size_t olen, size_t len,
-                                const char *what);
-SCM_API char *scm_must_strdup (const char *str);
-SCM_API char *scm_must_strndup (const char *str, size_t n);
-SCM_API void scm_done_malloc (long size);
-SCM_API void scm_done_free (long size);
-SCM_API void scm_must_free (void *obj);
+SCM_DEPRECATED void * scm_must_malloc (size_t len, const char *what);
+SCM_DEPRECATED void * scm_must_realloc (void *where,
+                                       size_t olen, size_t len,
+                                       const char *what);
+SCM_DEPRECATED char *scm_must_strdup (const char *str);
+SCM_DEPRECATED char *scm_must_strndup (const char *str, size_t n);
+SCM_DEPRECATED void scm_done_malloc (long size);
+SCM_DEPRECATED void scm_done_free (long size);
+SCM_DEPRECATED void scm_must_free (void *obj);
 
 #endif
 

diff --git a/libguile/macros.c b/libguile/macros.c
index 3e0942c..7d60a8e 100644 (file)
--- a/libguile/macros.c
+++ b/libguile/macros.c
@@ -22,6 +22,8 @@
 # include <config.h>
 #endif
 
+#define SCM_BUILDING_DEPRECATED_CODE
+
 #include "libguile/_scm.h"
 #include "libguile/alist.h" /* for SCM_EXTEND_ENV (well...) */
 #include "libguile/eval.h"

diff --git a/libguile/macros.h b/libguile/macros.h
index 8ff41c4..f05d2f1 100644 (file)
--- a/libguile/macros.h
+++ b/libguile/macros.h
@@ -3,7 +3,7 @@
 #ifndef SCM_MACROS_H
 #define SCM_MACROS_H
 
-/* Copyright (C) 1998,2000,2001,2002,2003, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1998,2000,2001,2002,2003, 2006, 2008, 2009 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
@@ -61,7 +61,7 @@ SCM_API SCM scm_make_synt (const char *name,
 SCM_INTERNAL void scm_init_macros (void);
 
 #if SCM_ENABLE_DEPRECATED == 1
-SCM_API SCM scm_makmacro (SCM code);
+SCM_DEPRECATED SCM scm_makmacro (SCM code);
 #endif
 
 #endif  /* SCM_MACROS_H */

diff --git a/libguile/ports.h b/libguile/ports.h
index 0f46e7f..2ac736e 100644 (file)
--- a/libguile/ports.h
+++ b/libguile/ports.h
@@ -310,7 +310,7 @@ SCM_API SCM scm_sys_make_void_port (SCM mode);
 SCM_INTERNAL void scm_init_ports (void);
 
 #if SCM_ENABLE_DEPRECATED==1
-SCM_API scm_t_port * scm_add_to_port_table (SCM port);
+SCM_DEPRECATED scm_t_port * scm_add_to_port_table (SCM port);
 #endif
 
 #ifdef GUILE_DEBUG

diff --git a/libguile/srfi-4.h b/libguile/srfi-4.h
index 3a45fd9..48001ab 100644 (file)
--- a/libguile/srfi-4.h
+++ b/libguile/srfi-4.h
@@ -286,7 +286,7 @@ SCM_INTERNAL scm_i_t_array_set scm_i_uniform_vector_set_proc (SCM uvec);
    interface.
 */
 
-SCM_API size_t scm_uniform_element_size (SCM obj);
+SCM_DEPRECATED size_t scm_uniform_element_size (SCM obj);
 
 #endif
 

diff --git a/libguile/strings.h b/libguile/strings.h
index 8a32918..e68bbe9 100644 (file)
--- a/libguile/strings.h
+++ b/libguile/strings.h
@@ -195,9 +195,9 @@ SCM_API SCM scm_sys_stringbuf_hist (void);
 
 #if SCM_ENABLE_DEPRECATED
 
-SCM_API int scm_i_deprecated_stringp (SCM obj);
-SCM_API char *scm_i_deprecated_string_chars (SCM str);
-SCM_API size_t scm_i_deprecated_string_length (SCM str);
+SCM_DEPRECATED int scm_i_deprecated_stringp (SCM obj);
+SCM_DEPRECATED char *scm_i_deprecated_string_chars (SCM str);
+SCM_DEPRECATED size_t scm_i_deprecated_string_length (SCM str);
 
 #define SCM_STRINGP(x)       scm_i_deprecated_stringp(x)
 #define SCM_STRING_CHARS(x)  scm_i_deprecated_string_chars(x)