From 7313f2d0aa90545d68782a076d1efca058c1d976 Mon Sep 17 00:00:00 2001 From: "Ben \"root\" Anderson" Date: Thu, 24 Oct 2013 18:29:58 -0500 Subject: [PATCH] Conditionalize some defines that MinGW/autoconf provide --- src/archutils/Win32/arch_setup.h | 3 +++ src/libtomcrypt/src/prngs/rng_get_bytes.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/archutils/Win32/arch_setup.h b/src/archutils/Win32/arch_setup.h index f2aa78e508..0d6f018ab1 100644 --- a/src/archutils/Win32/arch_setup.h +++ b/src/archutils/Win32/arch_setup.h @@ -161,7 +161,10 @@ inline long int lrintf( float f ) #define CRASH_HANDLER #endif +// autoconf does this for us +#if !defined(__MINGW32__) #define ENDIAN_LITTLE +#endif #define OGG_LIB_DIR "../extern/vorbis/win32/" diff --git a/src/libtomcrypt/src/prngs/rng_get_bytes.c b/src/libtomcrypt/src/prngs/rng_get_bytes.c index ee10e14383..5923205c1e 100644 --- a/src/libtomcrypt/src/prngs/rng_get_bytes.c +++ b/src/libtomcrypt/src/prngs/rng_get_bytes.c @@ -88,7 +88,10 @@ static unsigned long rng_ansic(unsigned char *buf, unsigned long len, /* Try the Microsoft CSP */ #if defined(WIN32) || defined(WINCE) +// XXX This probably shouldn't be hardcoded at all but I don't want to break anything +#if !defined(__MINGW32__) #define _WIN32_WINNT 0x0400 +#endif #ifdef WINCE #define UNDER_CE #define ARM