korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-16 00:34:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add temporary fix for the CUPS compile issue

Browse Source
This commit is contained in:
Marcel Holtmann 2008-09-06 18:55:26 +02:00
parent da22fe66ce
commit 0124ee98f7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap-configure
View File

@ -26,7 +26,7 @@ fi
--enable-pand \
--enable-dund \
--enable-test \
--disable-cups \
--enable-cups \
--disable-manpages \
--disable-configfiles \
--disable-initscripts \

3
cups/Makefile.am
View File

@ -6,8 +6,7 @@ cups_PROGRAMS = bluetooth
bluetooth_SOURCES = main.c cups.h sdp.c spp.c hcrp.c
bluetooth_LDADD = $(top_builddir)/common/libhelper.a \
@GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
bluetooth_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@
endif
AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@

7
cups/main.c
View File

@ -41,7 +41,6 @@
#include <gdbus.h>
#include "cups.h"
#include "sdp-xml.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);
@ -63,6 +62,11 @@ static DBusConnection *conn = NULL;
#define ATTRID_1284ID 0x0300
static sdp_record_t *sdp_xml_parse_record(const char *data, int size)
{
return NULL;
}
static char *parse_xml_sdp(const char *xml)
{
sdp_record_t *sdp_record;
@ -72,6 +76,7 @@ static char *parse_xml_sdp(const char *xml)
sdp_record = sdp_xml_parse_record(xml, strlen(xml));
if (sdp_record == NULL)
return NULL;
for (l = sdp_record->attrlist; l != NULL; l = l->next) {
sdp_data_t *data;