From c6627256555b3356238e57ffd749c413d28e8a3c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Wed, 14 Jun 2017 19:40:37 -0400 Subject: Remove duplicated build checks. Most of these #defines are not even checked anyway, though they could have the side-effect of failing configure before the build started. However, these checks are redundant due to other checks for the same thing: * concept_check.hpp was added to Boost in 1.19.0, released in 2000. I sincerely doubt anyone is using that version right now, but I added a minimum version to the find_package() call. In any case, no code actually checked the #define, so it wouldn't have built without it anyway. * FindBoehmGC puts gc.h on the compiler search path, so there's no need to try gc/gc.h also. * libintl.h is found by FindIntl. * unordered_set is part of the C++11 standard. * zlib.h is found by find_package(ZLIB). --- src/inkgc/gc-core.h | 4 ---- src/util/ege-tags.cpp | 2 -- src/widgets/ege-paint-def.cpp | 2 -- 3 files changed, 8 deletions(-) (limited to 'src') diff --git a/src/inkgc/gc-core.h b/src/inkgc/gc-core.h index a27510f50..407c857fb 100644 --- a/src/inkgc/gc-core.h +++ b/src/inkgc/gc-core.h @@ -19,11 +19,7 @@ #include #include -#ifdef HAVE_GC_GC_H -# include -#else # include -#endif namespace Inkscape { namespace GC { diff --git a/src/util/ege-tags.cpp b/src/util/ege-tags.cpp index 8a2ce0529..dcc28f370 100644 --- a/src/util/ege-tags.cpp +++ b/src/util/ege-tags.cpp @@ -38,9 +38,7 @@ #include "config.h" #endif // HAVE_CONFIG_H -#if HAVE_LIBINTL_H #include -#endif // HAVE_LIBINTL_H #if !defined(_) #define _(s) gettext(s) diff --git a/src/widgets/ege-paint-def.cpp b/src/widgets/ege-paint-def.cpp index 1a8ad041a..8e0ec9352 100644 --- a/src/widgets/ege-paint-def.cpp +++ b/src/widgets/ege-paint-def.cpp @@ -36,9 +36,7 @@ #include "config.h" -#ifdef HAVE_LIBINTL_H #include -#endif #include #include -- cgit v1.2.3