diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2011-04-22 04:10:07 +0400 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2011-04-22 04:10:07 +0400 |
| commit | 8ba4144d501d622c5612417ef3c6929d47aa2f87 (patch) | |
| tree | 13ce5d9d32832a1536f249772eb5a13203b0e2dc /winsup/w32api | |
| parent | a491557a5539ce0f93797e7ab25ce471216006a7 (diff) | |
2011-04-21 Chris Sutcliffe <ir0nh34d@users.sf.net>
* include/windef.h (PACKED): Remove macro.
* include/wincon.h: Replace PACKED macro with __attribute__((packed)).
Thanks to Keith Marshall for the fix.
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/w32api/include/wincon.h | 2 | ||||
| -rw-r--r-- | 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,5 +1,12 @@ 2011-04-21 Chris Sutcliffe <ir0nh34d@users.sf.net> + * 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 <ir0nh34d@users.sf.net> + * include/imagehlp.h (PREAD_PROCESS_MEMORY_ROUTINE): Correct definition. Thanks to Safety0ff for the report. 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 |