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_transport.h | |
| 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_transport.h')
| -rw-r--r-- | comms/openobex/files/patch-src-obex_transport.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/comms/openobex/files/patch-src-obex_transport.h b/comms/openobex/files/patch-src-obex_transport.h deleted file mode 100644 index 19157b1a42bc..000000000000 --- a/comms/openobex/files/patch-src-obex_transport.h +++ /dev/null @@ -1,36 +0,0 @@ ---- src/obex_transport.h.orig Mon Mar 22 18:02:08 2004 -+++ src/obex_transport.h Mon Mar 22 18:05:08 2004 -@@ -40,8 +40,12 @@ - #include "irda_wrap.h" - #endif /*HAVE_IRDA*/ - #ifdef HAVE_BLUETOOTH -+#ifdef HAVE_BLUETOOTH_NETGRAPH -+#include <bluetooth.h> -+#else /*HAVE_BLUETOOTH_NETGRAPH*/ - #include <bluetooth/bluetooth.h> - #include <bluetooth/rfcomm.h> -+#endif /*HAVE_BLUETOOTH_NETGRAPH*/ - #endif /*HAVE_BLUETOOTH*/ - - #include "obex_main.h" -@@ -52,7 +56,11 @@ - #endif /*HAVE_IRDA*/ - struct sockaddr_in inet; - #ifdef HAVE_BLUETOOTH -+#ifdef HAVE_BLUETOOTH_NETGRAPH -+ struct sockaddr_rfcomm rfcomm; -+#else /*HAVE_BLUETOOTH_NETGRAPH*/ - struct sockaddr_rc rfcomm; -+#endif /*HAVE_BLUETOOTH_NETGRAPH*/ - #endif /*HAVE_BLUETOOTH*/ - } saddr_t; - -@@ -76,7 +84,4 @@ - int obex_transport_read(obex_t *self, int count, uint8_t *buf, int buflen); - - --#endif OBEX_TRANSPORT_H -- -- -- -+#endif /*OBEX_TRANSPORT_H*/ |