diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-02-13 18:02:47 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-02-13 18:02:47 +0100 |
| commit | 44bca66c5929e63bb39ed68420a74c97523b411f (patch) | |
| tree | f82acaf62128b0e8224af7797357322897904270 /src/modules | |
| parent | c0fb91db545774ec45f208a6f771c22a0b153637 (diff) | |
make PA_GCC_PACKED and PA_GCC_MALLOC actually work
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/module-card-restore.c | 4 | ||||
| -rw-r--r-- | src/modules/module-device-restore.c | 4 | ||||
| -rw-r--r-- | src/modules/module-stream-restore.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/module-card-restore.c b/src/modules/module-card-restore.c index 4dffd365..909c0957 100644 --- 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 7c56c240..e6a48814 100644 --- 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 2dd2045e..434dc7a0 100644 --- 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, |