summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-08-30 16:56:03 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2010-08-30 16:56:03 +0200
commitbd71db9397fbf2fa585ada04bce151e800801c73 (patch)
tree88df7c37c006598aab6798d967f52e36b45730f6
parent52b888f8712d3cd970174ce4bb001f3979a88a6a (diff)
downloadabrt-bd71db9397fbf2fa585ada04bce151e800801c73.tar.gz
abrt-bd71db9397fbf2fa585ada04bce151e800801c73.tar.xz
abrt-bd71db9397fbf2fa585ada04bce151e800801c73.zip
consolidate HAVE_CONFIG_H in abrtlib.h
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--inc/abrtlib.h8
-rw-r--r--inc/plugin.h3
-rw-r--r--lib/utils/abrt_xmlrpc.cpp3
-rw-r--r--lib/utils/make_descr.cpp3
-rw-r--r--lib/utils/parse_release.cpp4
-rw-r--r--src/applet/Applet.cpp3
-rw-r--r--src/applet/applet_gtk.c3
-rw-r--r--src/cli/CLI.cpp3
-rw-r--r--src/cli/report.cpp3
-rw-r--r--src/daemon/CommLayerServerDBus.cpp3
-rw-r--r--src/daemon/Daemon.cpp3
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 <string>
#endif
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#if ENABLE_NLS
# include <libintl.h>
# 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 <config.h>
-#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 <config.h>
-#endif
#if HAVE_LOCALE_H
# include <locale.h>
#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 <config.h>
-#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 <config.h>
-#endif
#if HAVE_LOCALE_H
# include <locale.h>
#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 <cassert>
#include <algorithm>
#include <termios.h>
-#if HAVE_CONFIG_H
-# include <config.h>
-#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 <config.h>
-#endif
#include <dbus/dbus.h>
#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 <config.h>
-#endif
#if HAVE_LOCALE_H
# include <locale.h>
#endif