aboutsummaryrefslogtreecommitdiffstats
path: root/emulators/vba/files/patch-src_expr.cpp
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-02-01 20:22:05 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-02-01 20:22:05 +0000
commite019fe53d931b6594d7ea3d49b98cb04ab671026 (patch)
tree6821f72106d4d270ff34987ab9d22236ccdaf681 /emulators/vba/files/patch-src_expr.cpp
parent526d47e271d9f12c4d717177d29bde9022c929aa (diff)
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
Diffstat (limited to 'emulators/vba/files/patch-src_expr.cpp')
-rw-r--r--emulators/vba/files/patch-src_expr.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/emulators/vba/files/patch-src_expr.cpp b/emulators/vba/files/patch-src_expr.cpp
new file mode 100644
index 000000000000..e500e6062cd4
--- /dev/null
+++ b/emulators/vba/files/patch-src_expr.cpp
@@ -0,0 +1,19 @@
+--- src/expr.cpp.orig 2002-10-20 13:03:12 UTC
++++ src/expr.cpp
+@@ -14,15 +14,12 @@
+
+ #line 1 "expr.y"
+
+-namespace std {
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <memory.h>
+ #include <stdlib.h>
+ #include <string.h>
+-}
+
+-using namespace std;
+-
+ #include "System.h"
+ #include "elf.h"
+ #include "exprNode.h"