diff options
| author | Andy Wingo <wingo@pobox.com> | 2017-09-22 11:59:51 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2017-09-22 12:02:25 +0200 |
| commit | 2f9ad7d9bcd1f787e324158a1ee402d111e8608e (patch) | |
| tree | 7a79123f736074bfee46574e9067dd6702b39ff7 /libguile/struct.h | |
| parent | ed549da23078657836e359d9d9ef3c6bd01cd738 (diff) | |
| parent | c7c7588f2416624319be2a037056ba8bb1c054e7 (diff) | |
| download | guile-2f9ad7d9bcd1f787e324158a1ee402d111e8608e.tar.gz | |
Merge stable-2.2 into master
This commit resolves conflicts by removing the deprecated make-struct.
Diffstat (limited to 'libguile/struct.h')
| -rw-r--r-- | libguile/struct.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libguile/struct.h b/libguile/struct.h index 25d5ae53f..32af8ab5a 100644 --- a/libguile/struct.h +++ b/libguile/struct.h @@ -3,7 +3,8 @@ #ifndef SCM_STRUCT_H #define SCM_STRUCT_H -/* Copyright (C) 1995,1997,1999,2000,2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017 Free Software Foundation, Inc. +/* Copyright (C) 1995,1997,1999-2001, 2006-2013, 2015, + * 2017 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 @@ -153,7 +154,7 @@ SCM_API SCM scm_make_struct_layout (SCM fields); SCM_API SCM scm_struct_p (SCM x); SCM_API SCM scm_struct_vtable_p (SCM x); SCM_INTERNAL SCM scm_allocate_struct (SCM vtable, SCM n_words); -SCM_API SCM scm_make_struct (SCM vtable, SCM tail_array_size, SCM init); +SCM_API SCM scm_make_struct_no_tail (SCM vtable, SCM init); SCM_API SCM scm_c_make_struct (SCM vtable, size_t n_tail, size_t n_inits, scm_t_bits init, ...); SCM_API SCM scm_c_make_structv (SCM vtable, size_t n_tail, size_t n_inits, |