diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-07 12:46:04 +0200 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-12-07 12:46:04 +0200 |
commit | b8779d2202a2cd19fb9db8cdf9584a9718257072 (patch) | |
tree | 6683fa2c0f16f1a89a2ad9d73493220de7e1f474 /emulator | |
parent | 7ff3126564b2ddd48c8a522a584717f925459dbb (diff) | |
download | bluez-b8779d2202a2cd19fb9db8cdf9584a9718257072.tar.gz |
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
Diffstat (limited to 'emulator')
-rw-r--r-- | emulator/b1ee.c | 4 | ||||
-rw-r--r-- | emulator/btdev.c | 4 | ||||
-rw-r--r-- | emulator/main.c | 4 | ||||
-rw-r--r-- | emulator/server.c | 4 | ||||
-rw-r--r-- | emulator/vhci.c | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/emulator/b1ee.c b/emulator/b1ee.c index 18b827ece..17a60fca6 100644 --- a/emulator/b1ee.c +++ b/emulator/b1ee.c @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <errno.h> #include <fcntl.h> diff --git a/emulator/btdev.c b/emulator/btdev.c index bd158ee68..700c6a800 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <ctype.h> #include <stdlib.h> diff --git a/emulator/main.c b/emulator/main.c index 412470228..807c66396 100644 --- a/emulator/main.c +++ b/emulator/main.c @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <getopt.h> diff --git a/emulator/server.c b/emulator/server.c index ea8fa21c5..e4c4570b9 100644 --- a/emulator/server.c +++ b/emulator/server.c @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <errno.h> #include <ctype.h> diff --git a/emulator/vhci.c b/emulator/vhci.c index 0062bebf9..52876ba91 100644 --- a/emulator/vhci.c +++ b/emulator/vhci.c @@ -22,6 +22,10 @@ * */ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + #include <stdio.h> #include <errno.h> #include <fcntl.h> |