cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

print/hpijs: unbreak with libc++ 3.9

Browse Source 
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
This commit is contained in:
Jan Beich 2017-01-03 21:04:28 +00:00
parent c6a0cd9957
commit b682b1cf43
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=430521
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
print/hpijs/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= hpijs
PORTVERSION= 2.1.4
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= print
MASTER_SITES= SF/hpinkjet/${PORTNAME}/${PORTVERSION}

11
print/hpijs/files/patch-dj3320.cpp Normal file
View File

@ -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));

11
print/hpijs/files/patch-registry.cpp Normal file
View File

@ -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:");