Avoid overlap with std::mutex with C++11 STL.

3 files changed, 32 insertions, 1 deletions

diff --git a/lang/basic256/distinfo b/lang/basic256/distinfo
index 88da62413e2..83b0f6e276d 100644
--- a/lang/basic256/distinfo
+++ b/lang/basic256/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2012/08/10 14:20:54 ryoon Exp $
+$NetBSD: distinfo,v 1.3 2013/05/04 12:48:33 joerg Exp $
 
 SHA1 (basic256_0.9.6.71.tgz) = 3a8ee26230d5b14b5f325c3b6e0db511534d785f
 RMD160 (basic256_0.9.6.71.tgz) = 1edd4a2eb153eb9712f8b33e1ff2a64ebf1ba883
 Size (basic256_0.9.6.71.tgz) = 7924162 bytes
+SHA1 (patch-Interpreter.cpp) = 01800b5cd85f7c947b20ad803e04730839007ef0
+SHA1 (patch-RunController.cpp) = 7716844575a393900b9cab1e61abd6b18cf5b138
diff --git a/lang/basic256/patches/patch-Interpreter.cpp b/lang/basic256/patches/patch-Interpreter.cpp
new file mode 100644
index 00000000000..c5a20f7a0e0
--- /dev/null
+++ b/lang/basic256/patches/patch-Interpreter.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-Interpreter.cpp,v 1.1 2013/05/04 12:48:33 joerg Exp $
+
+Avoid overlap with std::mutex.
+
+--- Interpreter.cpp.orig	2013-05-04 00:26:28.000000000 +0000
++++ Interpreter.cpp
+@@ -69,6 +69,8 @@ using namespace std;
+ QMutex keymutex;
+ int currentKey;
+ 
++#define mutex my_mutex
++
+ extern QMutex mutex;
+ extern QMutex debugmutex;
+ extern QWaitCondition waitCond;
diff --git a/lang/basic256/patches/patch-RunController.cpp b/lang/basic256/patches/patch-RunController.cpp
new file mode 100644
index 00000000000..d8fb06d99ba
--- /dev/null
+++ b/lang/basic256/patches/patch-RunController.cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-RunController.cpp,v 1.1 2013/05/04 12:48:33 joerg Exp $
+
+Avoid overlap with std::mutex.
+
+--- RunController.cpp.orig	2013-05-04 00:27:12.000000000 +0000
++++ RunController.cpp
+@@ -80,6 +80,7 @@ using namespace std;
+ 	#define SDL_CHAN_SOUND 2
+ #endif
+ 
++#define mutex my_mutex
+ QMutex mutex;
+ QMutex debugmutex;
+ QWaitCondition waitCond;