diff options
author | Andy Wingo <wingo@pobox.com> | 2011-08-31 09:34:54 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-08-31 09:34:54 +0200 |
commit | 8b66aa8f5496a515ca133d6d2c37a06f6ec1720d (patch) | |
tree | ca666d93b6c310c6d76f8a0f0051407b9c92ee40 /libguile/bytevectors.c | |
parent | 02620dd9a628ec40ec4324adca9b82cd0442d1d2 (diff) | |
parent | 0b4f77192da214690aa811d13bb6a7f6dd576445 (diff) | |
download | guile-8b66aa8f5496a515ca133d6d2c37a06f6ec1720d.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/bytevectors.c
libguile/bytevectors.h
libguile/objcodes.c
libguile/r6rs-ports.c
libguile/strings.c
libguile/vm.c
Diffstat (limited to 'libguile/bytevectors.c')
-rw-r--r-- | libguile/bytevectors.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libguile/bytevectors.c b/libguile/bytevectors.c index 99ac1761d..8fc025285 100644 --- a/libguile/bytevectors.c +++ b/libguile/bytevectors.c @@ -178,7 +178,7 @@ /* Bytevector type. */ #define SCM_BYTEVECTOR_HEADER_BYTES \ - (SCM_BYTEVECTOR_HEADER_SIZE * sizeof (SCM)) + (SCM_BYTEVECTOR_HEADER_SIZE * sizeof (scm_t_bits)) #define SCM_BYTEVECTOR_SET_LENGTH(_bv, _len) \ SCM_SET_CELL_WORD_1 ((_bv), (scm_t_bits) (_len)) @@ -292,7 +292,7 @@ scm_i_make_typed_bytevector (size_t len, scm_t_array_element_type element_type) because it was allocated using `scm_gc_malloc ()', or because it is part of PARENT. */ SCM -scm_c_take_bytevector (signed char *contents, size_t len, SCM parent) +scm_c_take_gc_bytevector (signed char *contents, size_t len, SCM parent) { SCM ret; |