From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Wed, 17 Sep 2014 17:51:53 +0000 (+0100)
Subject: sysdeps: try to avoid re-including config.h
X-Git-Tag: dbus-1.9.14~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=267c69ac90d6c8e8ef4b8a80e669db16febb2b55;p=thirdparty%2Fdbus.git

sysdeps: try to avoid re-including config.h

Re-including config.h after we have already included glib.h breaks
the GLIB_VERSION_MAX_ALLOWED macro, and every .c file should be
including config.h anyway.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83115
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 181d9af8d..5f2b86772 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -25,7 +25,10 @@
 #ifndef DBUS_SYSDEPS_H
 #define DBUS_SYSDEPS_H
 
+#ifndef VERSION
+#warning Please include config.h before dbus-sysdeps.h
 #include "config.h"
+#endif
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>