From d675bd4c1d5925b54a6757c35c1ed156c1486a0d Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Sun, 30 Dec 2012 21:20:16 +0100 Subject: [PATCH] Fix mismerge: forgot a few lines in config.h.cmake --- config.h.cmake | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/config.h.cmake b/config.h.cmake index fe1a7817f..9a86e1e0a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -198,16 +198,3 @@ /* Use Apple Cocoa for the UI */ #cmakedefine USE_COCOA 1 - -/* Define to 1 if your compiler supports static_assert */ -#cmakedefine HAVE_STATIC_ASSERT 1 - -/* Generate minidumps on crash */ -#cmakedefine HAVE_DBGHELP 1 - -/* Define to 1 if your compiler supports static_assert */ -#cmakedefine HAVE_STATIC_ASSERT 1 - -/* Define to 1 if your compiler correctly supports boost::is_pod */ -#cmakedefine HAVE_WORKING_IS_POD 1 -