From 8ba4144d501d622c5612417ef3c6929d47aa2f87 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Fri, 22 Apr 2011 00:10:07 +0000 Subject: [PATCH] 2011-04-21 Chris Sutcliffe * include/windef.h (PACKED): Remove macro. * include/wincon.h: Replace PACKED macro with __attribute__((packed)). Thanks to Keith Marshall for the fix. --- winsup/w32api/ChangeLog | 7 +++++++ winsup/w32api/include/wincon.h | 2 +- winsup/w32api/include/windef.h | 4 ---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index ba9589bb5..cec0a4c31 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,10 @@ +2011-04-21 Chris Sutcliffe + + * include/windef.h (PACKED): Remove macro. + * include/wincon.h: Replace PACKED macro with __attribute__((packed)). + + Thanks to Keith Marshall for the fix. + 2011-04-21 Chris Sutcliffe * include/imagehlp.h (PREAD_PROCESS_MEMORY_ROUTINE): Correct definition. diff --git a/winsup/w32api/include/wincon.h b/winsup/w32api/include/wincon.h index 43a7b5a2b..d536acbcd 100644 --- a/winsup/w32api/include/wincon.h +++ b/winsup/w32api/include/wincon.h @@ -105,7 +105,7 @@ typedef struct _KEY_EVENT_RECORD { } #ifdef __GNUC__ /* gcc's alignment is not what win32 expects */ - PACKED + __attribute__((packed)) #endif KEY_EVENT_RECORD; diff --git a/winsup/w32api/include/windef.h b/winsup/w32api/include/windef.h index c02945eec..8ac80e157 100644 --- a/winsup/w32api/include/windef.h +++ b/winsup/w32api/include/windef.h @@ -68,7 +68,6 @@ extern "C" { #endif #ifdef __GNUC__ -#define PACKED __attribute__((packed)) #ifndef _fastcall #define _fastcall __attribute__((fastcall)) #endif @@ -93,10 +92,7 @@ extern "C" { #ifndef _declspec #define _declspec(e) __attribute__((e)) #endif -#elif defined(__WATCOMC__) -#define PACKED #else -#define PACKED #define _cdecl #define __cdecl #endif