diff options
| author | des <des@FreeBSD.org> | 2004-06-03 15:08:38 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-06-03 15:08:38 +0000 |
| commit | 938c9c10ab41ec85540c65736ce43b06bf7df835 (patch) | |
| tree | 986b7a72e4fb467be72f29cc62ad308cd342b269 | |
| parent | 1a19f0318def3be49d1ecc23a1362a8f3f2fb175 (diff) | |
| download | FreeBSD-ports-938c9c10ab41ec85540c65736ce43b06bf7df835.zip FreeBSD-ports-938c9c10ab41ec85540c65736ce43b06bf7df835.tar.gz | |
5.x's <usbhid.h> lacks __BEGIN_DECLS / __END_DECLS, so we need to wrap
it in extern "C" { }.
| -rw-r--r-- | x11-toolkits/plib/Makefile | 1 | ||||
| -rw-r--r-- | x11-toolkits/plib/files/patch-src::js::jsBSD.cxx | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile index 0504056..c067543 100644 --- a/x11-toolkits/plib/Makefile +++ b/x11-toolkits/plib/Makefile @@ -7,6 +7,7 @@ PORTNAME= plib PORTVERSION= 1.8.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://plib.sourceforge.net/dist/ diff --git a/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx b/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx index 527687d..4109a60 100644 --- a/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx +++ b/x11-toolkits/plib/files/patch-src::js::jsBSD.cxx @@ -1,5 +1,5 @@ ---- ./src/js/jsBSD.cxx.orig Sat Mar 20 01:21:53 2004 -+++ ./src/js/jsBSD.cxx Sun May 2 16:53:28 2004 +--- src/js/jsBSD.cxx.orig Sat Mar 20 01:21:53 2004 ++++ src/js/jsBSD.cxx Thu Jun 3 17:06:30 2004 @@ -44,7 +44,11 @@ #endif @@ -13,19 +13,17 @@ #ifdef HAVE_USB_JS #if defined(__NetBSD__) #ifdef HAVE_USBHID_H -@@ -53,9 +57,14 @@ - #include <usb.h> +@@ -54,7 +58,12 @@ #endif #elif defined(__FreeBSD__) -+# if __FreeBSD_version < 500000 extern "C" { -#include <libusbhid.h> ++# if __FreeBSD_version < 500000 +# include <libusbhid.h> - } +# else +# define HAVE_USBHID_H 1 +# include <usbhid.h> +# endif + } #endif #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> |
