diff options
author | Andy Wingo <wingo@pobox.com> | 2011-04-11 23:30:52 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-04-11 23:30:52 +0200 |
commit | 21c05db45b69f8a62b84c36abc86cb935fa967d7 (patch) | |
tree | 743df01da540e7fd628f54894e7d5fbe94b03996 /libguile/array-handle.h | |
parent | 4db853d747ac115f799c93e2de93f5159ad84109 (diff) | |
parent | c89b45299329d034875429804f18768c1ea96713 (diff) | |
download | guile-21c05db45b69f8a62b84c36abc86cb935fa967d7.tar.gz |
Merge remote branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
test-suite/tests/srfi-4.test
Diffstat (limited to 'libguile/array-handle.h')
-rw-r--r-- | libguile/array-handle.h | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/libguile/array-handle.h b/libguile/array-handle.h index caf9cefbf..2e8af77b6 100644 --- a/libguile/array-handle.h +++ b/libguile/array-handle.h @@ -3,7 +3,8 @@ #ifndef SCM_ARRAY_HANDLE_H #define SCM_ARRAY_HANDLE_H -/* Copyright (C) 1995,1996,1997,1999,2000,2001, 2004, 2006, 2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2004, 2006, + * 2008, 2009, 2011 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 @@ -64,25 +65,26 @@ typedef struct scm_t_array_dim ssize_t inc; } scm_t_array_dim; -typedef enum { - SCM_ARRAY_ELEMENT_TYPE_SCM = 0, /* SCM values */ - SCM_ARRAY_ELEMENT_TYPE_CHAR = 1, /* characters */ - SCM_ARRAY_ELEMENT_TYPE_BIT = 2, /* packed numeric values */ - SCM_ARRAY_ELEMENT_TYPE_VU8 = 3, - SCM_ARRAY_ELEMENT_TYPE_U8 = 4, - SCM_ARRAY_ELEMENT_TYPE_S8 = 5, - SCM_ARRAY_ELEMENT_TYPE_U16 = 6, - SCM_ARRAY_ELEMENT_TYPE_S16 = 7, - SCM_ARRAY_ELEMENT_TYPE_U32 = 8, - SCM_ARRAY_ELEMENT_TYPE_S32 = 9, - SCM_ARRAY_ELEMENT_TYPE_U64 = 10, - SCM_ARRAY_ELEMENT_TYPE_S64 = 11, - SCM_ARRAY_ELEMENT_TYPE_F32 = 12, - SCM_ARRAY_ELEMENT_TYPE_F64 = 13, - SCM_ARRAY_ELEMENT_TYPE_C32 = 14, - SCM_ARRAY_ELEMENT_TYPE_C64 = 15, - SCM_ARRAY_ELEMENT_TYPE_LAST = 15, -} scm_t_array_element_type; +typedef enum + { + SCM_ARRAY_ELEMENT_TYPE_SCM = 0, /* SCM values */ + SCM_ARRAY_ELEMENT_TYPE_CHAR = 1, /* characters */ + SCM_ARRAY_ELEMENT_TYPE_BIT = 2, /* packed numeric values */ + SCM_ARRAY_ELEMENT_TYPE_VU8 = 3, + SCM_ARRAY_ELEMENT_TYPE_U8 = 4, + SCM_ARRAY_ELEMENT_TYPE_S8 = 5, + SCM_ARRAY_ELEMENT_TYPE_U16 = 6, + SCM_ARRAY_ELEMENT_TYPE_S16 = 7, + SCM_ARRAY_ELEMENT_TYPE_U32 = 8, + SCM_ARRAY_ELEMENT_TYPE_S32 = 9, + SCM_ARRAY_ELEMENT_TYPE_U64 = 10, + SCM_ARRAY_ELEMENT_TYPE_S64 = 11, + SCM_ARRAY_ELEMENT_TYPE_F32 = 12, + SCM_ARRAY_ELEMENT_TYPE_F64 = 13, + SCM_ARRAY_ELEMENT_TYPE_C32 = 14, + SCM_ARRAY_ELEMENT_TYPE_C64 = 15, + SCM_ARRAY_ELEMENT_TYPE_LAST = 15 + } scm_t_array_element_type; SCM_INTERNAL SCM scm_i_array_element_types[]; |