From: Václav Slavík <vslavik@fastmail.fm>
Date: Tue, 9 Jul 2013 16:12:05 +0000 (+0000)
Subject: Compilation fix for r74457.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d4596328440c89a2e8efb9ce472fd6d2212d9db5?ds=inline

Compilation fix for r74457.

Remove stray #endif from incorrectly merged changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/defs.h b/include/wx/defs.h
index b83a43bd7a..16159b1f06 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -359,7 +359,6 @@ typedef short int WXTYPE;
 #ifndef HAVE_TR1_TYPE_TRAITS
     #if defined(__has_include) && __has_include(<tr1/type_traits>)
         #define HAVE_TR1_TYPE_TRAITS
-    #endif
     #elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
         #define HAVE_TR1_TYPE_TRAITS
     #endif