From 5c8334e63a82efcbdb007be042bee57f6111a5fa Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 12 Sep 2014 13:44:14 +0100 Subject: [PATCH 1/2] Re-order headers to avoid redefining GLIB_VERSION_MAX_ALLOWED with older GLib dbus-internals.h re-includes config.h, and glib.h redefines GLIB_VERSION_MAX_ALLOWED to the current version if it is a later version. The combination results in macro redefinition warnings. --- test/fdpass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/fdpass.c b/test/fdpass.c index 2bd0682..b4848e2 100644 --- a/test/fdpass.c +++ b/test/fdpass.c @@ -25,12 +25,12 @@ #include -#include - #include #include #include +#include + #include #ifdef G_OS_UNIX -- 2.1.0