diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2015-03-01 01:38:12 -0800 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-03-01 01:38:12 -0800 |
commit | 7a72ebec1ca51e5a44321b284a6328cbc1362332 (patch) | |
tree | 9f2de0eb1e9885f0c713a21c5212b756d3b180e5 /obexd/client | |
parent | a833587b52e2d5c74310774167edbf214e4a5b6b (diff) | |
download | bluez-7a72ebec1ca51e5a44321b284a6328cbc1362332.tar.gz |
obexd: Fix cross includes from client and plugins
Diffstat (limited to 'obexd/client')
-rw-r--r-- | obexd/client/bluetooth.c | 2 | ||||
-rw-r--r-- | obexd/client/dbus.c | 2 | ||||
-rw-r--r-- | obexd/client/driver.c | 2 | ||||
-rw-r--r-- | obexd/client/ftp.c | 3 | ||||
-rw-r--r-- | obexd/client/manager.c | 6 | ||||
-rw-r--r-- | obexd/client/map-event.c | 2 | ||||
-rw-r--r-- | obexd/client/map.c | 4 | ||||
-rw-r--r-- | obexd/client/mns.c | 14 | ||||
-rw-r--r-- | obexd/client/opp.c | 2 | ||||
-rw-r--r-- | obexd/client/pbap.c | 2 | ||||
-rw-r--r-- | obexd/client/session.c | 2 | ||||
-rw-r--r-- | obexd/client/sync.c | 2 | ||||
-rw-r--r-- | obexd/client/transfer.c | 2 | ||||
-rw-r--r-- | obexd/client/transport.c | 2 |
14 files changed, 23 insertions, 24 deletions
diff --git a/obexd/client/bluetooth.c b/obexd/client/bluetooth.c index 1857c65e3..be007de61 100644 --- a/obexd/client/bluetooth.c +++ b/obexd/client/bluetooth.c @@ -39,7 +39,7 @@ #include "gdbus/gdbus.h" #include "btio/btio.h" -#include "log.h" +#include "obexd/src/log.h" #include "transport.h" #include "bluetooth.h" diff --git a/obexd/client/dbus.c b/obexd/client/dbus.c index 323202099..bfe5c4974 100644 --- a/obexd/client/dbus.c +++ b/obexd/client/dbus.c @@ -27,7 +27,7 @@ #include "gdbus/gdbus.h" -#include "log.h" +#include "obexd/src/log.h" #include "dbus.h" static void append_variant(DBusMessageIter *iter, diff --git a/obexd/client/driver.c b/obexd/client/driver.c index 0e1421aa4..27857b571 100644 --- a/obexd/client/driver.c +++ b/obexd/client/driver.c @@ -31,10 +31,10 @@ #include "gdbus/gdbus.h" +#include "obexd/src/log.h" #include "transfer.h" #include "session.h" #include "driver.h" -#include "log.h" static GSList *drivers = NULL; diff --git a/obexd/client/ftp.c b/obexd/client/ftp.c index 02465809a..3628657d3 100644 --- a/obexd/client/ftp.c +++ b/obexd/client/ftp.c @@ -30,9 +30,8 @@ #include "gdbus/gdbus.h" +#include "obexd/src/log.h" #include "dbus.h" -#include "log.h" - #include "transfer.h" #include "session.h" #include "driver.h" diff --git a/obexd/client/manager.c b/obexd/client/manager.c index e47c861fa..fbcad6da4 100644 --- a/obexd/client/manager.c +++ b/obexd/client/manager.c @@ -35,17 +35,17 @@ #include "gdbus/gdbus.h" -#include "log.h" +#include "obexd/src/log.h" +#include "obexd/src/manager.h" #include "transfer.h" #include "session.h" -#include "manager.h" #include "bluetooth.h" #include "opp.h" #include "ftp.h" #include "pbap.h" #include "sync.h" #include "map.h" -#include "obexd/src/manager.h" +#include "manager.h" #define CLIENT_INTERFACE "org.bluez.obex.Client1" #define ERROR_INTERFACE "org.bluez.obex.Error" diff --git a/obexd/client/map-event.c b/obexd/client/map-event.c index 5a16ad26d..e164e863c 100644 --- a/obexd/client/map-event.c +++ b/obexd/client/map-event.c @@ -32,7 +32,7 @@ #include "gdbus/gdbus.h" -#include "log.h" +#include "obexd/src/log.h" #include "map-event.h" #include "transfer.h" diff --git a/obexd/client/map.c b/obexd/client/map.c index 10e2285ad..4c6d67629 100644 --- a/obexd/client/map.c +++ b/obexd/client/map.c @@ -38,9 +38,9 @@ #include "gobex/gobex-apparam.h" #include "gdbus/gdbus.h" +#include "obexd/src/log.h" +#include "obexd/src/map_ap.h" #include "dbus.h" -#include "log.h" -#include "map_ap.h" #include "map-event.h" #include "map.h" diff --git a/obexd/client/mns.c b/obexd/client/mns.c index 015f6ad46..14b184811 100644 --- a/obexd/client/mns.c +++ b/obexd/client/mns.c @@ -36,13 +36,13 @@ #include "gobex/gobex.h" #include "gobex/gobex-apparam.h" -#include "obexd.h" -#include "plugin.h" -#include "log.h" -#include "obex.h" -#include "service.h" -#include "mimetype.h" -#include "map_ap.h" +#include "obexd/src/obexd.h" +#include "obexd/src/plugin.h" +#include "obexd/src/log.h" +#include "obexd/src/obex.h" +#include "obexd/src/service.h" +#include "obexd/src/mimetype.h" +#include "obexd/src/map_ap.h" #include "map-event.h" #include "obexd/src/manager.h" diff --git a/obexd/client/opp.c b/obexd/client/opp.c index eb001e003..3c2801a5a 100644 --- a/obexd/client/opp.c +++ b/obexd/client/opp.c @@ -29,7 +29,7 @@ #include "gdbus/gdbus.h" -#include "log.h" +#include "obexd/src/log.h" #include "transfer.h" #include "session.h" diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c index 6b93ed004..1ab34a7db 100644 --- a/obexd/client/pbap.c +++ b/obexd/client/pbap.c @@ -38,7 +38,7 @@ #include "gobex/gobex-apparam.h" #include "gdbus/gdbus.h" -#include "log.h" +#include "obexd/src/log.h" #include "transfer.h" #include "session.h" diff --git a/obexd/client/session.c b/obexd/client/session.c index ba01ea4f8..39c82e631 100644 --- a/obexd/client/session.c +++ b/obexd/client/session.c @@ -39,8 +39,8 @@ #include "gdbus/gdbus.h" #include "gobex/gobex.h" +#include "obexd/src/log.h" #include "dbus.h" -#include "log.h" #include "transfer.h" #include "session.h" #include "driver.h" diff --git a/obexd/client/sync.c b/obexd/client/sync.c index a9f560544..548c318c3 100644 --- a/obexd/client/sync.c +++ b/obexd/client/sync.c @@ -33,7 +33,7 @@ #include "gdbus/gdbus.h" -#include "log.h" +#include "obexd/src/log.h" #include "transfer.h" #include "session.h" diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c index 5716a3f85..092e72fe2 100644 --- a/obexd/client/transfer.c +++ b/obexd/client/transfer.c @@ -40,8 +40,8 @@ #include "gdbus/gdbus.h" #include "gobex/gobex.h" +#include "obexd/src/log.h" #include "dbus.h" -#include "log.h" #include "transfer.h" #define TRANSFER_INTERFACE "org.bluez.obex.Transfer1" diff --git a/obexd/client/transport.c b/obexd/client/transport.c index 77e52f702..aae6780a2 100644 --- a/obexd/client/transport.c +++ b/obexd/client/transport.c @@ -30,8 +30,8 @@ #include <glib.h> #include <inttypes.h> +#include "obexd/src/log.h" #include "transport.h" -#include "log.h" static GSList *transports = NULL; |