summaryrefslogtreecommitdiff
path: root/libguile/struct.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-07-06 19:28:06 +0200
committerAndy Wingo <wingo@pobox.com>2012-07-06 19:28:06 +0200
commita38da400d7d7d65f1b2f667d80648816683ada8d (patch)
tree7e1e64dca22160a84708f62e93bec9cf20dd8fa0 /libguile/struct.h
parent2aed2667fce5ccb115667a36ffd368c4c3b6e9f4 (diff)
parent5f8d67ad09d21263d1ea2d537afcc5464d922dc5 (diff)
downloadguile-a38da400d7d7d65f1b2f667d80648816683ada8d.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
This anticipates deprecation of make-vtable-vtable in stable-2.0, which hasn't happened yet. Conflicts: libguile/deprecated.c libguile/deprecated.h libguile/print.c libguile/struct.c
Diffstat (limited to 'libguile/struct.h')
-rw-r--r--libguile/struct.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/libguile/struct.h b/libguile/struct.h
index 3e2bc5353..97b6768ad 100644
--- a/libguile/struct.h
+++ b/libguile/struct.h
@@ -3,7 +3,7 @@
#ifndef SCM_STRUCT_H
#define SCM_STRUCT_H
-/* Copyright (C) 1995,1997,1999,2000,2001, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1997,1999,2000,2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012 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
@@ -181,13 +181,9 @@ SCM_API SCM scm_c_make_structv (SCM vtable, size_t n_tail, size_t n_inits,
scm_t_bits init[]);
SCM_API SCM scm_make_vtable (SCM fields, SCM printer);
SCM_INTERNAL SCM scm_i_make_vtable_vtable (SCM extra_fields);
-#if SCM_ENABLE_DEPRECATED == 1
-SCM_DEPRECATED SCM scm_make_vtable_vtable (SCM extra_fields, SCM tail_array_size, SCM init);
-#endif
SCM_API SCM scm_struct_ref (SCM handle, SCM pos);
SCM_API SCM scm_struct_set_x (SCM handle, SCM pos, SCM val);
SCM_API SCM scm_struct_vtable (SCM handle);
-SCM_API SCM scm_struct_vtable_tag (SCM handle);
SCM_API SCM scm_struct_vtable_name (SCM vtable);
SCM_API SCM scm_set_struct_vtable_name_x (SCM vtable, SCM name);
SCM_API void scm_print_struct (SCM exp, SCM port, scm_print_state *);