diff options
| author | Frank J. Laszlo <laszlof@FreeBSD.org> | 2006-12-04 16:13:09 +0000 |
|---|---|---|
| committer | Frank J. Laszlo <laszlof@FreeBSD.org> | 2006-12-04 16:13:09 +0000 |
| commit | d9e559f2daba1ac02e7ddf60e53893ce85039df5 (patch) | |
| tree | 7805908bd7e0d154a20b189e17d993c2a5c122ea /comms/openobex/files/patch-src-obex_main.c | |
| parent | Fix a would-be problem in an #ifdef-ed out section of the patch. (diff) | |
Update to version 1.3
Patches applied upstream
PR: ports/105854
Submitted by: Matthew West <mwest@uct.ac.za>
Approved by: Guido Falsi <mad@madpilot.net> (maintainer)
Notes
Notes:
svn path=/head/; revision=178832
Diffstat (limited to 'comms/openobex/files/patch-src-obex_main.c')
| -rw-r--r-- | comms/openobex/files/patch-src-obex_main.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/comms/openobex/files/patch-src-obex_main.c b/comms/openobex/files/patch-src-obex_main.c deleted file mode 100644 index 174b0e933385..000000000000 --- a/comms/openobex/files/patch-src-obex_main.c +++ /dev/null @@ -1,26 +0,0 @@ ---- src/obex_main.c.orig Mon Mar 22 18:25:05 2004 -+++ src/obex_main.c Mon Mar 22 18:27:55 2004 -@@ -46,7 +46,11 @@ - #include <stdio.h> - - #ifdef HAVE_BLUETOOTH -+#ifdef HAVE_BLUETOOTH_NETGRAPH -+#include <bluetooth.h> -+#else /*HAVE_BLUETOOTH_NETGRAPH*/ - #include <bluetooth/bluetooth.h> -+#endif /*HAVE_BLUETOOTH_NETGRAPH*/ - #endif /*HAVE_BLUETOOTH*/ - - #endif /* _WIN32 */ -@@ -79,7 +83,11 @@ - - #ifdef HAVE_BLUETOOTH - if (domain == AF_BLUETOOTH) -+#ifdef HAVE_BLUETOOTH_NETGRAPH -+ proto = BLUETOOTH_PROTO_RFCOMM; -+#else /*HAVE_BLUETOOTH_NETGRAPH*/ - proto = BTPROTO_RFCOMM; -+#endif /*HAVE_BLUETOOTH_NETGRAPH*/ - #endif /*HAVE_BLUETOOTH*/ - - fd = socket(domain, SOCK_STREAM, proto); |