From 877f07834f79548e2c000451c082759b717f654f Mon Sep 17 00:00:00 2001 From: James Crook Date: Fri, 30 Mar 2018 20:45:48 +0100 Subject: [PATCH] Fix redefinition warning in Internat.h --- src/Internat.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Internat.h b/src/Internat.h index 85a875873..02ca6bc4b 100644 --- a/src/Internat.h +++ b/src/Internat.h @@ -31,6 +31,10 @@ extern const wxString& GetCustomSubstitution(const wxString& str1 ); // Marks strings for extraction only...must use wxGetTranslation() to translate. #define XO(s) wxT(s) +#ifdef _ + #undef _ +#endif + #if defined( __WXDEBUG__ ) // Force a crash if you misuse _ in a static initializer, so that translation // is looked up too early and not found. @@ -53,6 +57,11 @@ extern const wxString& GetCustomSubstitution(const wxString& str1 ); #define _(s) GetCustomTranslation((s)) #endif +#ifdef wxPLURAL + #undef wxPLURAL +#endif + + // The two string arugments will go to the .pot file, as // msgid sing // msgid_plural plural