From e491f6b335fe839b7034b9ba9b3a3c40318df9c5 Mon Sep 17 00:00:00 2001 From: goldsimon Date: Sun, 27 Jan 2008 10:35:01 +0000 Subject: [PATCH] remove double-define of BYTE_ORDER; added 2 #ifndefs to compile with cygwin gcc --- ports/win32/include/arch/cc.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ports/win32/include/arch/cc.h b/ports/win32/include/arch/cc.h index e19df63..d381618 100644 --- a/ports/win32/include/arch/cc.h +++ b/ports/win32/include/arch/cc.h @@ -37,16 +37,20 @@ #include #include -/** @todo fix some warnings */ +/** @todo fix some warnings: don't use #pragma if compiling with cygwin gcc */ +#ifndef __GNUC__ #pragma warning (disable: 4127) #pragma warning (disable: 4244) #pragma warning (disable: 4706) #pragma warning (disable: 4996) +#endif #define LWIP_PROVIDE_ERRNO -/* Define platform endianness */ +/* Define platform endianness (might already be defined) */ +#ifndef BYTE_ORDER #define BYTE_ORDER LITTLE_ENDIAN +#endif /* BYTE_ORDER */ /* Define generic types used in lwIP */ typedef unsigned char u8_t; @@ -66,9 +70,6 @@ typedef u32_t mem_ptr_t; #define S32_F "ld" #define X32_F "lx" -/* Compiler hints for byte order */ -#define BYTE_ORDER LITTLE_ENDIAN - /* Compiler hints for packing structures */ #define PACK_STRUCT_STRUCT #define PACK_STRUCT_USE_INCLUDES