diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-01-03 21:04:28 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-01-03 21:04:28 +0000 |
| commit | b682b1cf4366d3bfac69a1a4ac42d7f159975b19 (patch) | |
| tree | 69ede60e90d8192017c050bca898257ed112dd82 /print | |
| parent | devel/fam: unbreak with libc++ 3.9 (diff) | |
print/hpijs: unbreak with libc++ 3.9
registry.cpp:249:9: error: cannot initialize a variable of type 'char *' with an rvalue of type
'const char *'
char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:");
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
dj3320.cpp:429:24: error: assigning to 'char *' from incompatible type 'const char *'
if ((pcStr = strstr((const char*)pLDLEncap->byStatusBuff + 10, "$S:")) == NULL)
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
PR: 212343
Regressed by: https://github.com/llvm-mirror/libcxx/commit/b4aa97130b8b
Notes
Notes:
svn path=/head/; revision=430521
Diffstat (limited to 'print')
| -rw-r--r-- | print/hpijs/Makefile | 2 | ||||
| -rw-r--r-- | print/hpijs/files/patch-dj3320.cpp | 11 | ||||
| -rw-r--r-- | print/hpijs/files/patch-registry.cpp | 11 |
3 files changed, 23 insertions, 1 deletions
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index c53a23c33884..a16317323272 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -2,7 +2,7 @@ PORTNAME= hpijs PORTVERSION= 2.1.4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= print MASTER_SITES= SF/hpinkjet/${PORTNAME}/${PORTVERSION} diff --git a/print/hpijs/files/patch-dj3320.cpp b/print/hpijs/files/patch-dj3320.cpp new file mode 100644 index 000000000000..20f103620f4e --- /dev/null +++ b/print/hpijs/files/patch-dj3320.cpp @@ -0,0 +1,11 @@ +--- dj3320.cpp.orig 2005-08-22 18:47:00 UTC ++++ dj3320.cpp +@@ -400,7 +400,7 @@ DISPLAY_STATUS DJ3320::ParseError (BYTE + { + DRIVER_ERROR err = NO_ERROR; + BYTE byDevIDBuffer[DevIDBuffSize]; +- char *pcStr = NULL; ++ const char *pcStr = NULL; + BYTE byStatus1, byStatus2; + + memset(byDevIDBuffer, 0, sizeof(byDevIDBuffer)); diff --git a/print/hpijs/files/patch-registry.cpp b/print/hpijs/files/patch-registry.cpp new file mode 100644 index 000000000000..0a07b3f96dec --- /dev/null +++ b/print/hpijs/files/patch-registry.cpp @@ -0,0 +1,11 @@ +--- registry.cpp.orig 2005-08-22 18:47:00 UTC ++++ registry.cpp +@@ -246,7 +246,7 @@ DRIVER_ERROR DeviceRegistry::SelectDevic + device = eDJ3320; + match = TRUE; + } +- char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); ++ const char *cmdStr = strstr ((const char *) DevIDBuffer+2, "CMD:"); + if (!cmdStr) + { + cmdStr = strstr ((const char *) DevIDBuffer+2, "COMMAND SET:"); |