]> git.saurik.com Git - wxWidgets.git/commitdiff
Compilation fix for r74457.
authorVáclav Slavík <vslavik@fastmail.fm>
Tue, 9 Jul 2013 16:12:05 +0000 (16:12 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Tue, 9 Jul 2013 16:12:05 +0000 (16:12 +0000)
Remove stray #endif from incorrectly merged changes.

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

include/wx/defs.h

index b83a43bd7a051b476f05a8d8c7531180a1851a99..16159b1f0655743fcec54469157d5cfe6a91b953 100644 (file)
@@ -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