From b8779d2202a2cd19fb9db8cdf9584a9718257072 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Fri, 7 Dec 2012 12:46:04 +0200
Subject: Revert "Ensure config.h is included by using CPPFLAGS"

This reverts commit 8a03376544b046a84301847d1594f6c3674983ff.

The patch needs to be split up and the gdbus/ changes were bogus
compared to the original commit message.

Conflicts:
	Makefile.am
	Makefile.obexd
	profiles/cyclingspeed/cyclingspeed.c
	profiles/heartrate/heartrate.c
	src/error.c
---
 gobex/gobex-apparam.c  | 4 ++++
 gobex/gobex-defs.c     | 4 ++++
 gobex/gobex-header.c   | 4 ++++
 gobex/gobex-packet.c   | 4 ++++
 gobex/gobex-transfer.c | 4 ++++
 gobex/gobex.c          | 4 ++++
 6 files changed, 24 insertions(+)

(limited to 'gobex')

diff --git a/gobex/gobex-apparam.c b/gobex/gobex-apparam.c
index 0c3cc8aa4..442a3f140 100644
--- a/gobex/gobex-apparam.c
+++ b/gobex/gobex-apparam.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
diff --git a/gobex/gobex-defs.c b/gobex/gobex-defs.c
index f1f3b38ff..c184c9c91 100644
--- a/gobex/gobex-defs.c
+++ b/gobex/gobex-defs.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 
 #include "gobex-defs.h"
diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c
index 6136f2c2b..80e8e4e6f 100644
--- a/gobex/gobex-header.c
+++ b/gobex/gobex-header.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 
 #include "gobex-header.h"
diff --git a/gobex/gobex-packet.c b/gobex/gobex-packet.c
index d59bbce2f..c3e395310 100644
--- a/gobex/gobex-packet.c
+++ b/gobex/gobex-packet.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <errno.h>
 
diff --git a/gobex/gobex-transfer.c b/gobex/gobex-transfer.c
index f29a7ce25..724c78828 100644
--- a/gobex/gobex-transfer.c
+++ b/gobex/gobex-transfer.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <errno.h>
 
diff --git a/gobex/gobex.c b/gobex/gobex.c
index 59a0159ee..7c136af9e 100644
--- a/gobex/gobex.c
+++ b/gobex/gobex.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-- 
cgit v1.2.1