From c8ea74cab0f73fb420543d8fd4f081c8a1862050 Mon Sep 17 00:00:00 2001 From: Tim Kosse Date: Sat, 14 Jun 2014 20:20:19 +0000 Subject: [PATCH] Don't redefine _FORCENAMELESSUNION it if it is already defined. Fixes a warning when compiling with MinGW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ole/automtn.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp index cc3dda234b..81c563dc3b 100644 --- a/src/msw/ole/automtn.cpp +++ b/src/msw/ole/automtn.cpp @@ -26,7 +26,10 @@ #include "wx/math.h" #endif -#define _FORCENAMELESSUNION +#ifndef _FORCENAMELESSUNION + #define _FORCENAMELESSUNION +#endif + #include "wx/msw/private.h" #include "wx/msw/ole/oleutils.h" #include "wx/msw/ole/automtn.h"