From d1a24b6fe38e15e02e607a71161b3f3c8a7bbad7 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sat, 9 Apr 2011 12:56:52 +0000 Subject: Avoid re-defining uint32_t when using mingw compiler Since MingW for quite a long time (since 3.2 in 2008?) has defined 'uint32_t' etc. in it's , we need to guard against defining them again. Ideally we should figure out in what version of MingW this happened. But for now: Signed-off-by: Gisle Vanem Acked-by: David Sommerseth Signed-off-by: David Sommerseth (cherry picked from commit 6a8270c29120473570ec6da4003226f36a4b71eb) --- win/config.h.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'win') diff --git a/win/config.h.in b/win/config.h.in index fb349d0..82344a0 100644 --- a/win/config.h.in +++ b/win/config.h.in @@ -26,6 +26,9 @@ * Configuration header for Win32 using the MSVC environment. */ +#ifndef OPENVPN_CONFIG_H +#define OPENVPN_CONFIG_H + #include #include #include "autodefs.h" /* machine generated */ @@ -274,6 +277,7 @@ typedef unsigned long in_addr_t; /* type to use in place of socklen_t if not defined */ #define socklen_t unsigned int +#ifndef __MINGW32__ /* 32-bit unsigned type */ #define uint32_t unsigned int @@ -282,6 +286,7 @@ typedef unsigned long in_addr_t; /* 8-bit unsigned type */ #define uint8_t unsigned char +#endif /* __MINGW32__ */ /* Route command */ #define ROUTE_PATH "route" @@ -314,3 +319,5 @@ typedef int intptr_t; #define HAVE_CPP_VARARG_MACRO_ISO 1 #endif #endif + +#endif /* OPENVPN_CONFIG_H */ -- cgit v1.2.3