diff options
| author | miwi <miwi@FreeBSD.org> | 2012-01-15 03:58:48 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2012-01-15 03:58:48 +0800 |
| commit | 0e8307fc94dcbd2a9f2727c5eaa412329591a5a1 (patch) | |
| tree | 39fb880c2cee00b0b1af905a3cfabe95de2e00aa | |
| parent | f465b67140c62afab30981b6a5ea2436010442de (diff) | |
| download | freebsd-ports-gnome-0e8307fc94dcbd2a9f2727c5eaa412329591a5a1.tar.gz freebsd-ports-gnome-0e8307fc94dcbd2a9f2727c5eaa412329591a5a1.tar.zst freebsd-ports-gnome-0e8307fc94dcbd2a9f2727c5eaa412329591a5a1.zip | |
- Unbreak build on clang/gcc46
PR: 163440
Submitted by: Jan Beich <jbeich@tormail.net>
Approved by: maintainer
| -rw-r--r-- | sysutils/uhidd/files/patch-hidump.c | 11 | ||||
| -rw-r--r-- | sysutils/uhidd/files/patch-uhidd-lex.l | 19 | ||||
| -rw-r--r-- | sysutils/uhidd/files/patch-uhidd-uhidd.c | 19 |
3 files changed, 49 insertions, 0 deletions
diff --git a/sysutils/uhidd/files/patch-hidump.c b/sysutils/uhidd/files/patch-hidump.c new file mode 100644 index 000000000000..3a536456e452 --- /dev/null +++ b/sysutils/uhidd/files/patch-hidump.c @@ -0,0 +1,11 @@ +--- uhidd/uhidd_hidump.c~ ++++ uhidd/uhidd_hidump.c +@@ -296,7 +296,7 @@ get_unit(int dval, unsigned int sz) + + normal: + for (i = 1; (unsigned int)i < sz * 2; i++) { +- nibble = (dval >> (i * 4)) && 0x0F; ++ nibble = (dval >> (i * 4)) & 0x0F; + if (!nibble) + continue; + if (nibble > 7) diff --git a/sysutils/uhidd/files/patch-uhidd-lex.l b/sysutils/uhidd/files/patch-uhidd-lex.l new file mode 100644 index 000000000000..1feea71aa942 --- /dev/null +++ b/sysutils/uhidd/files/patch-uhidd-lex.l @@ -0,0 +1,19 @@ +--- uhidd/lex.l~ ++++ uhidd/lex.l +@@ -34,7 +34,6 @@ + + #include "y.tab.h" + +-#define YY_NO_UNPUT + int lineno = 1; + + int yylex(void); +@@ -42,6 +41,8 @@ + %} + + %option noyywrap ++%option nounput ++%option noinput + + %% + diff --git a/sysutils/uhidd/files/patch-uhidd-uhidd.c b/sysutils/uhidd/files/patch-uhidd-uhidd.c new file mode 100644 index 000000000000..e62091b8ba9f --- /dev/null +++ b/sysutils/uhidd/files/patch-uhidd-uhidd.c @@ -0,0 +1,19 @@ +--- uhidd/uhidd.c~ ++++ uhidd/uhidd.c +@@ -313,7 +313,6 @@ + static int + open_device(const char *dev, struct libusb20_device *pdev) + { +- struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; + struct libusb20_config *config; + struct libusb20_interface *iface; + int cndx, e, i; +@@ -334,8 +333,6 @@ open_device(const char *dev, struct libu + return (-1); + } + +- ddesc = libusb20_dev_get_device_desc(pdev); +- + /* + * Iterate each interface. + */ |