diff options
| author | Mark H Weaver <mhw@netris.org> | 2013-03-28 05:09:53 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2013-03-28 05:09:53 -0400 |
| commit | 26d148066f9cb20e395a7dc4fefdf2e2ef0b2fb0 (patch) | |
| tree | 40f13bc6355adb822bb8cd01fee5bcd9fd5430f9 /libguile/struct.c | |
| parent | 8ae26afefee947c71314733c419519fb616bf36d (diff) | |
| parent | 579127cce488ce208d62e68e679e34fbbdc17367 (diff) | |
| download | guile-26d148066f9cb20e395a7dc4fefdf2e2ef0b2fb0.tar.gz | |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
configure.ac
libguile/deprecated.c
libguile/deprecated.h
libguile/filesys.h
libguile/fluids.c
libguile/fports.c
libguile/gc.c
libguile/guile.c
libguile/numbers.c
libguile/objcodes.c
libguile/r6rs-ports.c
libguile/smob.c
libguile/socket.c
libguile/threads.h
module/language/scheme/decompile-tree-il.scm
module/language/tree-il/peval.scm
test-suite/tests/syncase.test
Diffstat (limited to 'libguile/struct.c')
| -rw-r--r-- | libguile/struct.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libguile/struct.c b/libguile/struct.c index db79e7974..c7f410b63 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2007, + * 2008, 2009, 2010, 2011, 2012, 2013 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 @@ -152,8 +153,9 @@ SCM_DEFINE (scm_make_struct_layout, "make-struct-layout", 1, 0, 0, #undef FUNC_NAME -/* Check whether VTABLE instances have a simple layout (i.e., either only "pr" - or only "pw" fields) and update its flags accordingly. */ +/* Check whether VTABLE instances have a simple layout (i.e., either + only "pr" or only "pw" fields and no tail array) and update its flags + accordingly. */ static void set_vtable_layout_flags (SCM vtable) { @@ -179,13 +181,11 @@ set_vtable_layout_flags (SCM vtable) switch (c_layout[field + 1]) { case 'w': - case 'W': if (field == 0) flags |= SCM_VTABLE_FLAG_SIMPLE_RW; break; case 'r': - case 'R': flags &= ~SCM_VTABLE_FLAG_SIMPLE_RW; break; |