1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-16 03:24:07 +00:00
freebsd-ports/devel/gcvs/files/patch-rf_umenu.cpp
Jan Beich 9ad196a4cb devel/gcvs: unbreak with libc++ 3.9
AppGlue.cpp:263:9: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
                char *login = strchr(ccvsroot, '@');
                      ^       ~~~~~~~~~~~~~~~~~~~~~
CvsArgs.cpp:201:16: error: call to 'strchr' is ambiguous
                bool hasLF = strchr(newarg, '\n') != 0L;
                             ^~~~~~
CvsArgs.cpp:210:19: error: call to 'strchr' is ambiguous
                bool hasSpace = strchr(newarg, ' ') != 0L;
                                ^~~~~~
TextBinary.cpp:466:8: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
        char *tmp = strrchr(file, '.');
              ^     ~~~~~~~~~~~~~~~~~~
UCvsFiles.cpp:2020:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(r1, '.')) != 0L)
                  ^~~~~~
UCvsFiles.cpp:2028:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(r2, '.')) != 0L)
                  ^~~~~~
umenu.cpp:257:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(copy, '\t')) != 0L)
                  ^~~~~~
umenu.cpp:280:12: error: call to 'strchr' is ambiguous
        if((tmp = strchr(title, '&')) != 0L)
                  ^~~~~~

Reported by:	pkg-fallout
2017-02-01 20:23:02 +00:00

21 lines
637 B
C++

--- rf/umenu.cpp.orig 2001-09-04 02:29:03 UTC
+++ rf/umenu.cpp
@@ -254,7 +254,7 @@ static void GetMenuTitle(const char *nam
// get the accelerator
UStr copy(name);
char *tmp;
- if((tmp = strchr(copy, '\t')) != 0L)
+ if((tmp = strchr((char *)copy, '\t')) != 0L)
{
*tmp++ = '\0';
if(strncmp(tmp, CTRLALT_STROKE, strlen(CTRLALT_STROKE)) == 0)
@@ -277,7 +277,7 @@ static void GetMenuTitle(const char *nam
title = name;
#ifndef WIN32
- if((tmp = strchr(title, '&')) != 0L)
+ if((tmp = strchr((char *)title, '&')) != 0L)
{
size_t l = tmp - (const char *)title;
memmove(&title[l], &title[l + 1], title.length() - l);