1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
freebsd-ports/emulators/vba/files/patch-src_GBA.cpp
Jan Beich e019fe53d9 emulators/vba: unbreak with libc++ 3.9
../GBA.cpp:1133:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
../GBA.cpp:1148:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
../GBA.cpp:1172:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
../GBA.cpp:1192:12: error: cannot initialize a variable of type 'char *' with an rvalue of type 'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
../Util.cpp:481:12: error: cannot initialize a variable of type 'char *' with an rvalue of type
      'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
../Util.cpp:505:12: error: cannot initialize a variable of type 'char *' with an rvalue of type
      'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
../Util.cpp:525:12: error: cannot initialize a variable of type 'char *' with an rvalue of type
      'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
../Util.cpp:555:12: error: cannot initialize a variable of type 'char *' with an rvalue of type
      'const char *'
    char * p = strrchr(file,'.');
           ^   ~~~~~~~~~~~~~~~~~
In file included from expr.y:12:
In file included from ../../src/System.h:24:
In file included from ../../src/unzip.h:68:
In file included from /usr/include/zlib.h:34:
In file included from /usr/include/zconf.h:247:
/usr/include/c++/v1/stddef.h:52:7: error: reference to 'std' is ambiguous
using std::nullptr_t;
      ^
/usr/include/c++/v1/__nullptr:22:1: note: candidate found by name lookup is 'std'
_LIBCPP_BEGIN_NAMESPACE_STD
^
/usr/include/c++/v1/__config:388:47: note: expanded from macro '_LIBCPP_BEGIN_NAMESPACE_STD'
 #define _LIBCPP_BEGIN_NAMESPACE_STD namespace std {inline namespace _LIBCPP_NAMESPACE {
                                               ^
/usr/include/c++/v1/__config:392:11: note: candidate found by name lookup is 'std::std'
namespace std {
          ^

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

39 lines
1.1 KiB
C++

--- src/GBA.cpp.orig 2004-05-13 14:37:59 UTC
+++ src/GBA.cpp
@@ -1130,7 +1130,7 @@ bool CPUWriteBMPFile(const char *fileNam
bool CPUIsZipFile(const char * file)
{
if(strlen(file) > 4) {
- char * p = strrchr(file,'.');
+ const char * p = strrchr(file,'.');
if(p != NULL) {
if(_stricmp(p, ".zip") == 0)
@@ -1145,7 +1145,7 @@ bool CPUIsGBAImage(const char * file)
{
cpuIsMultiBoot = false;
if(strlen(file) > 4) {
- char * p = strrchr(file,'.');
+ const char * p = strrchr(file,'.');
if(p != NULL) {
if(_stricmp(p, ".gba") == 0)
@@ -1169,7 +1169,7 @@ bool CPUIsGBAImage(const char * file)
bool CPUIsGBABios(const char * file)
{
if(strlen(file) > 4) {
- char * p = strrchr(file,'.');
+ const char * p = strrchr(file,'.');
if(p != NULL) {
if(_stricmp(p, ".gba") == 0)
@@ -1189,7 +1189,7 @@ bool CPUIsGBABios(const char * file)
bool CPUIsELF(const char *file)
{
if(strlen(file) > 4) {
- char * p = strrchr(file,'.');
+ const char * p = strrchr(file,'.');
if(p != NULL) {
if(_stricmp(p, ".elf") == 0)