From 07fc0e5ff9a939d3cbd4d5462da86e9f782e8e10 Mon Sep 17 00:00:00 2001 From: deuce <> Date: Fri, 16 Jul 2004 18:02:41 +0000 Subject: [PATCH] Fix SH_DENY* redefinition warnings. --- xtrn/sbl/sbldefs.h | 8 ++++++++ xtrn/sbl/sblpack.c | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xtrn/sbl/sbldefs.h b/xtrn/sbl/sbldefs.h index ae1b7e25e4..d4a3ea7f6c 100644 --- a/xtrn/sbl/sbldefs.h +++ b/xtrn/sbl/sbldefs.h @@ -57,6 +57,14 @@ #pragma pack(1) #endif +#ifndef _PACK + #ifdef __GNUC__ + #define _PACK __attribute__ ((packed)) + #else + #define _PACK + #endif +#endif + typedef union _PACK { struct { diff --git a/xtrn/sbl/sblpack.c b/xtrn/sbl/sblpack.c index 8e0b28d094..5daad044b4 100644 --- a/xtrn/sbl/sblpack.c +++ b/xtrn/sbl/sblpack.c @@ -41,8 +41,7 @@ #include <fcntl.h> #include <sys/stat.h> #include "filewrap.h" /* sopen() */ -#include "xsdkwrap.h" /* PLATFORM_DESC */ -#include "xsdkdefs.h" +#include "genwrap.h" /* PLATFORM_DESC */ #include "sbldefs.h" int main(void) -- GitLab