From 8a63ecf127e7ee87716367ae7b2e19267e19d09f Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Mon, 1 Oct 2018 22:59:56 +0200 Subject: Avoid duplicating defines in config.h and on command line --- src/main-cmdlinexact.cpp | 4 ++++ src/main-cmdlinexact.h | 5 ++++- src/main.cpp | 4 ++++ src/path-prefix.h | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main-cmdlinexact.cpp b/src/main-cmdlinexact.cpp index 46f42d0d2..a30251275 100644 --- a/src/main-cmdlinexact.cpp +++ b/src/main-cmdlinexact.cpp @@ -9,6 +9,10 @@ * more details: http://wiki.inkscape.org/wiki/index.php/Using_xverbs */ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #ifdef WITH_YAML #include diff --git a/src/main-cmdlinexact.h b/src/main-cmdlinexact.h index 431b046fa..8b9c137d9 100644 --- a/src/main-cmdlinexact.h +++ b/src/main-cmdlinexact.h @@ -1,7 +1,10 @@ - #ifndef __INK_MAIN_CMD_LINE_XACTIONS_H__ #define __INK_MAIN_CMD_LINE_XACTIONS_H__ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #ifdef WITH_YAML /** \file diff --git a/src/main.cpp b/src/main.cpp index 5af472ff7..25119b43a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -23,6 +23,10 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + // This has to be included prior to anything that includes setjmp.h, it croaks otherwise #include diff --git a/src/path-prefix.h b/src/path-prefix.h index 929419c1d..71bbb40fb 100644 --- a/src/path-prefix.h +++ b/src/path-prefix.h @@ -12,6 +12,11 @@ */ #ifndef SEEN_PATH_PREFIX_H #define SEEN_PATH_PREFIX_H + +#ifdef HAVE_CONFIG_H +# include "config.h" // only include where actually required! +#endif + #include "prefix.h" -- cgit v1.2.3