diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-10 20:21:44 +0200 |
---|---|---|
committer | Frediano Ziglio <fziglio@redhat.com> | 2015-09-01 14:18:29 +0100 |
commit | 59f09e69689068b8ce97807cf592faab1c848e92 (patch) | |
tree | adf529eb21c2fd3829f88b793bef1a96277617fc | |
parent | 82e1592ee10e32c01fbee4e5f4a5c9c32d7a17a7 (diff) |
Remove useless pack attribute
Acked-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
-rw-r--r-- | server/red_worker.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index c83f13e..e7ee6b6 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -46,6 +46,7 @@ #include <setjmp.h> #include <openssl/ssl.h> #include <inttypes.h> +#include <glib.h> #include <spice/protocol.h> #include <spice/qxl_dev.h> @@ -5930,35 +5931,24 @@ static inline void red_init_zlib(RedWorker *worker) } } -#ifdef __GNUC__ -#define ATTR_PACKED __attribute__ ((__packed__)) -#else -#define ATTR_PACKED -#pragma pack(push) -#pragma pack(1) -#endif - - -typedef struct ATTR_PACKED rgb32_pixel_t { +typedef struct { uint8_t b; uint8_t g; uint8_t r; uint8_t pad; } rgb32_pixel_t; -typedef struct ATTR_PACKED rgb24_pixel_t { +G_STATIC_ASSERT(sizeof(rgb32_pixel_t) == 4); + +typedef struct { uint8_t b; uint8_t g; uint8_t r; } rgb24_pixel_t; -typedef uint16_t rgb16_pixel_t; +G_STATIC_ASSERT(sizeof(rgb24_pixel_t) == 3); -#ifndef __GNUC__ -#pragma pack(pop) -#endif - -#undef ATTR_PACKED +typedef uint16_t rgb16_pixel_t; #define RED_BITMAP_UTILS_RGB16 #include "red_bitmap_utils.h" |