From 46ca7a277da33a695db5a5de3a84ee08bf8155a9 Mon Sep 17 00:00:00 2001 From: Shamus Hammons Date: Tue, 1 Jun 2004 19:11:45 +0000 Subject: [PATCH] Added pack() to gcc/win32 target --- src/include/wnaspi32.h | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/include/wnaspi32.h b/src/include/wnaspi32.h index b2c7ef5..5a0a1ad 100644 --- a/src/include/wnaspi32.h +++ b/src/include/wnaspi32.h @@ -17,9 +17,7 @@ #ifndef __WNASPI32_H__ #define __WNASPI32_H__ -/* -** Make sure structures are packed and undecorated. -*/ +// Make sure structures are packed and undecorated. #ifdef __BORLANDC__ #pragma option -a1 @@ -29,6 +27,10 @@ #pragma pack(1) #endif //__MSC_VER +#ifdef __GCCWIN32__ +#pragma pack(1) +#endif + #ifdef __cplusplus extern "C" { #endif //__cplusplus @@ -85,7 +87,7 @@ extern "C" { #define SS_NO_ASPI 0xE3 // No ASPI managers resident #define SS_FAILED_INIT 0xE4 // ASPI for windows failed init #define SS_ASPI_IS_BUSY 0xE5 // No resources available to execute cmd -#define SS_BUFFER_TO_BIG 0xE6 // Buffer size to big to handle! +#define SS_BUFFER_TOO_BIG 0xE6 // Buffer size too big to handle! #define SS_MISMATCHED_COMPONENTS 0xE7 // The DLLs/EXEs of ASPI don't version check #define SS_NO_ADAPTERS 0xE8 // No host adapters to manage #define SS_INSUFFICIENT_RESOURCES 0xE9 // Couldn't allocate resources needed to init @@ -306,9 +308,7 @@ extern BOOL TranslateASPI32Address( PDWORD, PDWORD ); #endif -/* -** Restore compiler default packing and close off the C declarations. -*/ +// Restore compiler default packing and close off the C declarations. #ifdef __BORLANDC__ #pragma option -a. @@ -318,6 +318,10 @@ extern BOOL TranslateASPI32Address( PDWORD, PDWORD ); #pragma pack() #endif //_MSC_VER +#ifdef __GCCWIN32__ +#pragma pack() +#endif + #ifdef __cplusplus } #endif //__cplusplus -- 2.37.2