projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 21162d7)
sysdeps: try to avoid re-including config.h
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 17 Sep 2014 17:51:53 +0000 (18:51 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 20 Feb 2015 20:49:29 +0000 (20:49 +0000)
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>
dbus/dbus-sysdeps.h patch | blob | history

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 181d9af..5f2b867 100644 (file)
--- 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>
Domain: System / IPC;