make PA_GCC_PACKED and PA_GCC_MALLOC actually work

diff --git a/src/modules/module-card-restore.c b/src/modules/module-card-restore.c
index 4dffd365412fff76295ed3fe99ff330578d4ced0..909c0957ed7ceefcca86bb37782bd1f69e2611ca 100644 (file)
--- a/src/modules/module-card-restore.c
+++ b/src/modules/module-card-restore.c
@@ -70,10 +70,10 @@ struct userdata {
 
 #define ENTRY_VERSION 1
 
-struct entry PA_GCC_PACKED {
+struct entry {
     uint8_t version;
     char profile[PA_NAME_MAX];
-};
+} PA_GCC_PACKED ;
 
 static void save_time_callback(pa_mainloop_api*a, pa_time_event* e, const struct timeval *tv, void *userdata) {
     struct userdata *u = userdata;

diff --git a/src/modules/module-device-restore.c b/src/modules/module-device-restore.c
index 7c56c24089514cebece27ba2973590c5b1bb4bce..e6a48814eab4627e5a6a17330ddb023a13093823 100644 (file)
--- a/src/modules/module-device-restore.c
+++ b/src/modules/module-device-restore.c
@@ -81,12 +81,12 @@ struct userdata {
 
 #define ENTRY_VERSION 1
 
-struct entry PA_GCC_PACKED {
+struct entry {
     uint8_t version;
     pa_bool_t muted:1;
     pa_channel_map channel_map;
     pa_cvolume volume;
-};
+} PA_GCC_PACKED;
 
 static void save_time_callback(pa_mainloop_api*a, pa_time_event* e, const struct timeval *tv, void *userdata) {
     struct userdata *u = userdata;

diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index 2dd2045e30f8b83734c6944eaa2ed05ed4fd8d7a..434dc7a06293679ae546f4ef10bd9d2ec0b252cf 100644 (file)
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -93,7 +93,7 @@ struct userdata {
 
 #define ENTRY_VERSION 1
 
-struct entry PA_GCC_PACKED {
+struct entry {
     uint8_t version;
     pa_bool_t muted_valid:1, relative_volume_valid:1, absolute_volume_valid:1, device_valid:1;
     pa_bool_t muted:1;
@@ -101,7 +101,7 @@ struct entry PA_GCC_PACKED {
     pa_cvolume relative_volume;
     pa_cvolume absolute_volume;
     char device[PA_NAME_MAX];
-};
+} PA_GCC_PACKED;
 
 enum {
     SUBCOMMAND_TEST,

diff --git a/src/pulse/gccmacro.h b/src/pulse/gccmacro.h
index 0b1a1a66907beb774b38616abba9ac00b52b7d65..0f751c03cea43add4df92a95c0be5232114404ca 100644 (file)
--- a/src/pulse/gccmacro.h
+++ b/src/pulse/gccmacro.h
@@ -88,7 +88,7 @@
 #endif
 
 #ifndef PA_GCC_PACKED
-#ifdef __GNUCC__
+#ifdef __GNUC__
 #define PA_GCC_PACKED __attribute__ ((packed))
 #else
 /** Structure shall be packed in memory **/
@@ -109,7 +109,7 @@
 #endif
 
 #ifndef PA_GCC_MALLOC
-#ifdef __GNUCC__
+#ifdef __GNUC__
 #define PA_GCC_MALLOC __attribute__ ((malloc))
 #else
 /** Macro for usage of GCC's malloc attribute */

diff --git a/src/pulsecore/shm.c b/src/pulsecore/shm.c
index c59d247cf551747ed87ed6d7be855099fe90c16a..b8c5f786b7ec3b390005bac2cdadad4651b4e2d3 100644 (file)
--- a/src/pulsecore/shm.c
+++ b/src/pulsecore/shm.c
@@ -70,14 +70,14 @@
 
 /* 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 {
+struct shm_marker {
     pa_atomic_t marker; /* 0xbeefcafe */
     pa_atomic_t pid;
     uint64_t _reserved1;
     uint64_t _reserved2;
     uint64_t _reserved3;
     uint64_t _reserved4;
-};
+} PA_GCC_PACKED;
 
 static char *segment_name(char *fn, size_t l, unsigned id) {
     pa_snprintf(fn, l, "/pulse-shm-%u", id);