From 0a14f620f8be275db4a8f88a50d12044c9e6cf8a Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 23 Dec 2008 05:55:16 +0100
Subject: Fix inclusion of SDP and protocol function declarations

---
 cups/cups.h | 6 ++++++
 cups/hcrp.c | 2 ++
 cups/main.c | 6 ------
 cups/sdp.c  | 2 ++
 cups/spp.c  | 2 ++
 5 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'cups')

diff --git a/cups/cups.h b/cups/cups.h
index c8de4ab8..3a97c4ab 100644
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -30,3 +30,9 @@ enum {					/**** Backend exit codes ****/
 	CUPS_BACKEND_CANCEL = 5,	/* Job failed, cancel job */
 	CUPS_BACKEND_RETRY = 6,		/* Failure requires us to retry (BlueZ specific) */
 };
+
+int sdp_search_spp(sdp_session_t *sdp, uint8_t *channel);
+int sdp_search_hcrp(sdp_session_t *sdp, unsigned short *ctrl_psm, unsigned short *data_psm);
+
+int spp_print(bdaddr_t *src, bdaddr_t *dst, uint8_t channel, int fd, int copies, const char *cups_class);
+int hcrp_print(bdaddr_t *src, bdaddr_t *dst, unsigned short ctrl_psm, unsigned short data_psm, int fd, int copies, const char *cups_class);
diff --git a/cups/hcrp.c b/cups/hcrp.c
index 5f0211e2..97bfdd96 100644
--- a/cups/hcrp.c
+++ b/cups/hcrp.c
@@ -34,6 +34,8 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/l2cap.h>
+#include <bluetooth/sdp.h>
+#include <bluetooth/sdp_lib.h>
 
 #include <netinet/in.h>
 
diff --git a/cups/main.c b/cups/main.c
index fdfe3007..6f5a9672 100644
--- a/cups/main.c
+++ b/cups/main.c
@@ -42,12 +42,6 @@
 
 #include "cups.h"
 
-extern int sdp_search_spp(sdp_session_t *sdp, uint8_t *channel);
-extern int sdp_search_hcrp(sdp_session_t *sdp, unsigned short *ctrl_psm, unsigned short *data_psm);
-
-extern int spp_print(bdaddr_t *src, bdaddr_t *dst, uint8_t channel, int fd, int copies, const char *cups_class);
-extern int hcrp_print(bdaddr_t *src, bdaddr_t *dst, unsigned short ctrl_psm, unsigned short data_psm, int fd, int copies, const char *cups_class);
-
 #define PRINTER_SERVICE_CLASS_NAME "printer"
 
 struct cups_device {
diff --git a/cups/sdp.c b/cups/sdp.c
index 62f5c491..5e4e0964 100644
--- a/cups/sdp.c
+++ b/cups/sdp.c
@@ -35,6 +35,8 @@
 #include <bluetooth/sdp.h>
 #include <bluetooth/sdp_lib.h>
 
+#include "cups.h"
+
 int sdp_search_hcrp(sdp_session_t *sdp, unsigned short *ctrl_psm, unsigned short *data_psm)
 {
 	sdp_list_t *srch, *attrs, *rsp;
diff --git a/cups/spp.c b/cups/spp.c
index cd9bfd58..4a99a8c1 100644
--- a/cups/spp.c
+++ b/cups/spp.c
@@ -33,6 +33,8 @@
 
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/rfcomm.h>
+#include <bluetooth/sdp.h>
+#include <bluetooth/sdp_lib.h>
 
 #include "cups.h"
 
-- 
cgit