summaryrefslogtreecommitdiff
path: root/libguile/foreign.c
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-09-20 03:49:46 -0400
committerMark H Weaver <mhw@netris.org>2014-09-20 05:38:05 -0400
commit156119b0223cf14d335ebda84701a69b2ba95757 (patch)
tree515ffaf2bea88d23bbb40d7eb192640d13dbd8f3 /libguile/foreign.c
parenta85c78ea1393985fdb6e6678dea19135c553d341 (diff)
downloadguile-156119b0223cf14d335ebda84701a69b2ba95757.tar.gz
Do not assume that 64-bit integers will be 64-bit aligned.
* libguile/foreign.c (raw_bytecode, objcode_cells): * libguile/gsubr.c (raw_bytecode, objcode_cells): Use SCM_ALIGNED to ensure 64-bit alignment.
Diffstat (limited to 'libguile/foreign.c')
-rw-r--r--libguile/foreign.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/foreign.c b/libguile/foreign.c
index 01af90019..5c30d5458 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 2010-2014 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
@@ -814,7 +814,7 @@ SCM_DEFINE (scm_pointer_to_procedure, "pointer->procedure", 3, 0, 0,
static const struct
{
- scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
const scm_t_uint8 bytes[10 * (sizeof (struct scm_objcode) + 8
+ sizeof (struct scm_objcode) + 32)];
} raw_bytecode = {
@@ -867,7 +867,7 @@ make_objcode_trampoline (unsigned int nargs)
static const struct
{
- scm_t_uint64 dummy; /* alignment */
+ SCM_ALIGNED (8) scm_t_uint64 dummy; /* alignment */
scm_t_cell cells[10 * 2]; /* 10 double cells */
} objcode_cells = {
0,