From bd71db9397fbf2fa585ada04bce151e800801c73 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 30 Aug 2010 16:56:03 +0200 Subject: consolidate HAVE_CONFIG_H in abrtlib.h Signed-off-by: Denys Vlasenko --- inc/abrtlib.h | 8 ++++---- inc/plugin.h | 3 --- lib/utils/abrt_xmlrpc.cpp | 3 --- lib/utils/make_descr.cpp | 3 --- lib/utils/parse_release.cpp | 4 ---- src/applet/Applet.cpp | 3 --- src/applet/applet_gtk.c | 3 --- src/cli/CLI.cpp | 3 --- src/cli/report.cpp | 3 --- src/daemon/CommLayerServerDBus.cpp | 3 --- src/daemon/Daemon.cpp | 3 --- 11 files changed, 4 insertions(+), 35 deletions(-) diff --git a/inc/abrtlib.h b/inc/abrtlib.h index c574834f..8ceaf9da 100644 --- a/inc/abrtlib.h +++ b/inc/abrtlib.h @@ -42,10 +42,6 @@ # include #endif -#ifdef HAVE_CONFIG_H -# include -#endif - #if ENABLE_NLS # include # define _(S) gettext(S) @@ -65,6 +61,10 @@ int vdprintf(int d, const char *format, va_list ap); #undef ARRAY_SIZE #define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include "abrt_types.h" #include "xfuncs.h" #include "logging.h" diff --git a/inc/plugin.h b/inc/plugin.h index 420a7cd8..a22d0f67 100644 --- a/inc/plugin.h +++ b/inc/plugin.h @@ -22,9 +22,6 @@ #ifndef PLUGIN_H_ #define PLUGIN_H_ -#if HAVE_CONFIG_H -# include -#endif #include "abrt_types.h" #include "crash_types.h" diff --git a/lib/utils/abrt_xmlrpc.cpp b/lib/utils/abrt_xmlrpc.cpp index ac2654ed..bf74f05b 100644 --- a/lib/utils/abrt_xmlrpc.cpp +++ b/lib/utils/abrt_xmlrpc.cpp @@ -16,9 +16,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include "config.h" -#endif #include "abrtlib.h" #include "abrt_xmlrpc.h" #include "abrt_exception.h" diff --git a/lib/utils/make_descr.cpp b/lib/utils/make_descr.cpp index dc5273ca..50f68501 100644 --- a/lib/utils/make_descr.cpp +++ b/lib/utils/make_descr.cpp @@ -16,9 +16,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include "abrtlib.h" #include "crash_types.h" #include "debug_dump.h" /* FILENAME_ARCHITECTURE etc */ diff --git a/lib/utils/parse_release.cpp b/lib/utils/parse_release.cpp index 0b8bf5eb..e648dc63 100644 --- a/lib/utils/parse_release.cpp +++ b/lib/utils/parse_release.cpp @@ -16,11 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif #include "abrtlib.h" - #include "strbuf.h" // caller is reposible for freeing *product* and *version* diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp index b83c3d2c..cc29fbde 100644 --- a/src/applet/Applet.cpp +++ b/src/applet/Applet.cpp @@ -16,9 +16,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include -#endif #if HAVE_LOCALE_H # include #endif diff --git a/src/applet/applet_gtk.c b/src/applet/applet_gtk.c index 7a9fcc0c..e7b18bda 100644 --- a/src/applet/applet_gtk.c +++ b/src/applet/applet_gtk.c @@ -16,9 +16,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include -#endif #include "abrtlib.h" #include "applet_gtk.h" diff --git a/src/cli/CLI.cpp b/src/cli/CLI.cpp index 425ab2d5..b9c0397a 100644 --- a/src/cli/CLI.cpp +++ b/src/cli/CLI.cpp @@ -15,9 +15,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include -#endif #if HAVE_LOCALE_H # include #endif diff --git a/src/cli/report.cpp b/src/cli/report.cpp index 9584feb5..f56050fb 100644 --- a/src/cli/report.cpp +++ b/src/cli/report.cpp @@ -18,9 +18,6 @@ #include #include #include -#if HAVE_CONFIG_H -# include -#endif #include "report.h" #include "run-command.h" #include "dbus.h" diff --git a/src/daemon/CommLayerServerDBus.cpp b/src/daemon/CommLayerServerDBus.cpp index 4a3c5add..e40b1093 100644 --- a/src/daemon/CommLayerServerDBus.cpp +++ b/src/daemon/CommLayerServerDBus.cpp @@ -16,9 +16,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include -#endif #include #include "abrtlib.h" #include "abrt_dbus.h" diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp index 83fc46ec..028c466c 100644 --- a/src/daemon/Daemon.cpp +++ b/src/daemon/Daemon.cpp @@ -16,9 +16,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#if HAVE_CONFIG_H -# include -#endif #if HAVE_LOCALE_H # include #endif -- cgit