head	1.4;
access;
symbols
	pkgsrc-2019Q3:1.3.0.22
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.20
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.18
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.16
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.14
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.12
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.10
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.8
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.6
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.2
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.2.0.16
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.14
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.12
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.10
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.8
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.6
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.4
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.2
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.1.0.16
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.14
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.12
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.10
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.8
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@// @;


1.4
date	2019.10.27.13.50.55;	author kamil;	state dead;
branches;
next	1.3;
commitid	vMBl7SGHUZVMHvIB;

1.3
date	2017.06.17.19.42.58;	author joerg;	state Exp;
branches;
next	1.2;
commitid	8WeRIQHWZnnSmLVz;

1.2
date	2015.06.10.14.58.50;	author joerg;	state Exp;
branches
	1.2.16.1;
next	1.1;
commitid	LNR02eFK0mC3wToy;

1.1
date	2013.05.04.12.48.33;	author joerg;	state Exp;
branches;
next	;

1.2.16.1
date	2017.06.21.18.55.38;	author bsiegert;	state Exp;
branches;
next	;
commitid	rs3jFYGEz8VGYgWz;


desc
@@


1.4
log
@basic256: Retired

Upstream dead. Last release 1.1.4.0 in 2014.
@
text
@$NetBSD: patch-Interpreter.cpp,v 1.3 2017/06/17 19:42:58 joerg Exp $

Avoid overlap with std::mutex.
Fix delete use.
Avoid overlap between std::bind and bind(2).

--- Interpreter.cpp.orig	2012-08-06 14:57:58.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;
@@@@ -2446,7 +2448,7 @@@@ Interpreter::execByteCode()
 					poly.drawPolygon(points, pairs);
 					poly.end();
 					if (!fastgraphics) waitForGraphics();
-					delete points;
+					delete[] points;
 				}
 			} else {
 				errornum = ERROR_POLYARRAY;
@@@@ -2487,7 +2489,7 @@@@ Interpreter::execByteCode()
 				poly.end();
 	
 				if (!fastgraphics) waitForGraphics();
-				delete points;
+				delete[] points;
 			}
 		}
 		break;
@@@@ -2538,7 +2540,7 @@@@ Interpreter::execByteCode()
 						poly.end();
 						if (!fastgraphics) waitForGraphics();
 
-						delete points;
+						delete[] points;
 					}
 				}
 			} else {
@@@@ -2608,7 +2610,7 @@@@ Interpreter::execByteCode()
 					poly.end();
 					
 					if (!fastgraphics) waitForGraphics();
-					delete points;
+					delete[] points;
 				}
 			}
 		}
@@@@ -3400,7 +3402,7 @@@@ Interpreter::execByteCode()
 								serv_addr.sin_family = AF_INET;
 								serv_addr.sin_addr.s_addr = INADDR_ANY;
 								serv_addr.sin_port = htons(port);
-								if (bind(tempsockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
+								if (::bind(tempsockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
 									errornum = ERROR_NETBIND;
 									errormessage = strerror(errno);
 									tempsockfd = netSockClose(tempsockfd);
@


1.3
log
@Fix portability.
@
text
@d1 1
a1 1
$NetBSD: patch-Interpreter.cpp,v 1.2 2015/06/10 14:58:50 joerg Exp $
@


1.2
log
@Explicitly use local array type. Fix deletes on arrays. Bump revision.
@
text
@d1 1
a1 1
$NetBSD: patch-Interpreter.cpp,v 1.1 2013/05/04 12:48:33 joerg Exp $
d4 2
d54 9
@


1.2.16.1
log
@Pullup ticket #5485 - requested by sevan
lang/basic256: bugfix

Revisions pulled up:
- lang/basic256/distinfo                                        1.7
- lang/basic256/patches/patch-Interpreter.cpp                   1.3

---
   Module Name:    pkgsrc
   Committed By:   joerg
   Date:           Sat Jun 17 19:42:58 UTC 2017

   Modified Files:
           pkgsrc/lang/basic256: distinfo
           pkgsrc/lang/basic256/patches: patch-Interpreter.cpp

   Log Message:
   Fix portability.
@
text
@d1 1
a1 1
$NetBSD$
a3 2
Fix delete use.
Avoid overlap between std::bind and bind(2).
a51 9
@@@@ -3400,7 +3402,7 @@@@ Interpreter::execByteCode()
 								serv_addr.sin_family = AF_INET;
 								serv_addr.sin_addr.s_addr = INADDR_ANY;
 								serv_addr.sin_port = htons(port);
-								if (bind(tempsockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
+								if (::bind(tempsockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
 									errornum = ERROR_NETBIND;
 									errormessage = strerror(errno);
 									tempsockfd = netSockClose(tempsockfd);
@


1.1
log
@Avoid overlap with std::mutex with C++11 STL.
@
text
@d1 1
a1 1
$NetBSD$
d5 1
a5 1
--- Interpreter.cpp.orig	2013-05-04 00:26:28.000000000 +0000
d16 36
@