From: Will Thompson <will.thompson@collabora.co.uk>
Date: Thu, 17 Jun 2010 13:45:16 +0000 (+0100)
Subject: Fix dbus-sysdeps.h on amd64, again.
X-Git-Tag: dbus-1.3.1~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9f9c2518dbf7c728588442b68916ec6c8b1f91f;p=platform%2Fupstream%2Fdbus.git

Fix dbus-sysdeps.h on amd64, again.

HAVE_STDINT_H is defined in config.h, but that's not much use if
config.h isn't included. The new file dbus/dbus-config.c includes this
header without including config.h first, so fails to build.

Since dbus-sysdeps.h is internal, we can include config.h with impunity,
rather than relying on our callers to do so. Also, there's no need to
include stdint.h twice.
---

diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 0fd5da7..c98db36 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -25,6 +25,8 @@
 #ifndef DBUS_SYSDEPS_H
 #define DBUS_SYSDEPS_H
 
+#include "config.h"
+
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
@@ -39,10 +41,6 @@
 #include <string.h>
 #include <stdarg.h>
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
-
 /* AIX sys/poll.h does #define events reqevents, and other
  * wonderousness, so must include sys/poll before declaring
  * DBusPollFD