diff options
author | Lennart Poettering <lennart@poettering.net> | 2008-04-11 16:52:45 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2008-04-11 16:52:45 +0000 |
commit | 2c6176fdd40ccec36b3788a07289cf57cafd028f (patch) | |
tree | 87b751a2d320faa23921502c43063a6e49de4f43 | |
parent | 29cbd88138291d4344bad166b9943814b943e293 (diff) |
mark shm marker struct as packed, to guarantee identical sizes between archs
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2254 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r-- | src/pulsecore/shm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c index 33034e24..a1bbf609 100644 --- a/src/pulsecore/shm.c +++ b/src/pulsecore/shm.c @@ -42,6 +42,7 @@ #endif #include <pulse/xmalloc.h> +#include <pulse/gccmacro.h> #include <pulsecore/core-error.h> #include <pulsecore/log.h> @@ -69,8 +70,9 @@ #define SHM_MARKER ((int) 0xbeefcafe) -/* We now put this SHM marker at the end of each segment. It's optional to not require a reboot when upgrading, though */ -struct shm_marker { +/* We now put this SHM marker at the end of each segment. It's + * optional, to not require a reboot when upgrading, though */ +struct shm_marker PA_GCC_PACKED { pa_atomic_t marker; /* 0xbeefcafe */ pa_atomic_t pid; uint64_t *_reserverd1; |