diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-04-25 02:06:01 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-04-25 02:06:01 -0400 |
| commit | 475772ea57c97d0fa0f9ed9303db137d9798ddd3 (patch) | |
| tree | 99a9ba2ea0b044552016d41c5c9197bbac66d97f /libguile/srfi-4.c | |
| parent | 0e92ef40d047696eb3334405b2dd32f51ca55006 (diff) | |
| parent | e0da53b4fe4abee2cdcd97fe46eeefcaab1da631 (diff) | |
| download | guile-475772ea57c97d0fa0f9ed9303db137d9798ddd3.tar.gz | |
Merge branch 'stable-2.0'v2.1.0
Conflicts:
GUILE-VERSION
NEWS
guile-readline/ice-9/readline.scm
libguile/async.c
libguile/backtrace.c
libguile/deprecated.h
libguile/gc-malloc.c
libguile/gdbint.c
libguile/init.c
libguile/ioext.c
libguile/mallocs.c
libguile/print.c
libguile/rw.c
libguile/scmsigs.c
libguile/script.c
libguile/simpos.c
libguile/snarf.h
libguile/strports.c
libguile/threads.c
libguile/vm-i-scheme.c
libguile/vm-i-system.c
module/srfi/srfi-18.scm
test-suite/Makefile.am
test-suite/standalone/test-num2integral.c
Diffstat (limited to 'libguile/srfi-4.c')
| -rw-r--r-- | libguile/srfi-4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libguile/srfi-4.c b/libguile/srfi-4.c index d8a264c54..057664c58 100644 --- a/libguile/srfi-4.c +++ b/libguile/srfi-4.c @@ -137,12 +137,13 @@ scm_t_array_handle *h, \ size_t *lenp, ssize_t *incp) \ { \ + size_t byte_width = width * sizeof (ctype); \ if (!scm_is_bytevector (uvec) \ - || (scm_c_bytevector_length (uvec) % width)) \ + || (scm_c_bytevector_length (uvec) % byte_width)) \ scm_wrong_type_arg_msg (NULL, 0, uvec, #tag "vector"); \ scm_array_get_handle (uvec, h); \ if (lenp) \ - *lenp = scm_c_bytevector_length (uvec) / width; \ + *lenp = scm_c_bytevector_length (uvec) / byte_width; \ if (incp) \ *incp = 1; \ return ((ctype *)h->writable_elements); \ |