diff options
author | Andy Wingo <wingo@pobox.com> | 2011-12-19 18:00:28 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-12-19 18:00:28 +0100 |
commit | 296004b3ba34139292eb1d8bf54739ee1a082712 (patch) | |
tree | 149e2c87f169583ade59bbb876530fc03af9b2ea /libguile/vm-i-scheme.c | |
parent | bfe35b90ff0c7f78335e70bdb26ea3466f6e98d9 (diff) | |
parent | 52b680f85e84689778f10ed8f9e72adf8316fbe7 (diff) | |
download | guile-296004b3ba34139292eb1d8bf54739ee1a082712.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/feature.c
m4/gnulib-cache.m4
module/ice-9/deprecated.scm
module/language/tree-il/peval.scm
Diffstat (limited to 'libguile/vm-i-scheme.c')
-rw-r--r-- | libguile/vm-i-scheme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c index f4fa44630..ad16c46cc 100644 --- a/libguile/vm-i-scheme.c +++ b/libguile/vm-i-scheme.c @@ -727,7 +727,7 @@ VM_DEFINE_INSTRUCTION (176, slot_set, "slot-set", 0, 3, 0) /* Return true (non-zero) if PTR has suitable alignment for TYPE. */ #define ALIGNED_P(ptr, type) \ - ((scm_t_uintptr) (ptr) % alignof (type) == 0) + ((scm_t_uintptr) (ptr) % alignof_type (type) == 0) VM_DEFINE_FUNCTION (177, bv_u16_ref, "bv-u16-ref", 3) BV_REF_WITH_ENDIANNESS (u16, u16) |