Fix build with newer GCC

15 files changed, 210 insertions, 1 deletions

diff --git a/devel/nqc/distinfo b/devel/nqc/distinfo
index 58ad62315f3..9f7bd6cac35 100644
--- a/devel/nqc/distinfo
+++ b/devel/nqc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2009/02/17 19:13:46 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/11/25 21:48:02 joerg Exp $
 
 SHA1 (nqc-2.3.r1.tar.gz) = 40adcd87c12fc23c600899a6a704620ef2208488
 RMD160 (nqc-2.3.r1.tar.gz) = 2f7a435a99cb207814a8f357b701b1cc1fee2964
@@ -6,3 +6,17 @@ Size (nqc-2.3.r1.tar.gz) = 193028 bytes
 SHA1 (patch-aa) = 0682d30f8c98e6b152e7227d5526a79bff91707b
 SHA1 (patch-ab) = 6fbe6b629ac170475cfeffb8848ba8337d4a13cd
 SHA1 (patch-ac) = d189cbbae24c2aba43aab100c4bb19c2ee24b89f
+SHA1 (patch-compiler_AsmStmt.h) = 93c11a7d8b76f5bf7dd29e92cdbe2c4568c357e4
+SHA1 (patch-compiler_Bytecode.h) = 36f638117dab8e6651b0a55c2a2610f48394b885
+SHA1 (patch-compiler_CallStmt.h) = ce72aabda32fa11ab15807787e93ce3be173f1c9
+SHA1 (patch-compiler_Compiler.h) = f1680a3e90b8d254aabe38451b3c79e629148640
+SHA1 (patch-compiler_Expr.h) = 8fc39474b9f4477dc15bfd1a2e7f0367e580095c
+SHA1 (patch-compiler_FunctionDef.h) = f63bfe971ed91b81c906c7491321ce3a8c1bb047
+SHA1 (patch-compiler_Mapping.h) = 2cd220e46748e5ca55b510c5b891071e15bbaf3c
+SHA1 (patch-compiler_PreProc.h) = cc959faca2496e17d24627e2ec491d9fbc23d7dd
+SHA1 (patch-compiler_Program.h) = fbc57643c0323c17535060515d23ebfc7cc6cacc
+SHA1 (patch-compiler_Scope.h) = 3f2c98fd77e0c93570bdb5bcf01d9239961abca9
+SHA1 (patch-compiler_ScopeStmt.h) = 0010a6625cfc8fcf1f6bdf37743d060b021918dd
+SHA1 (patch-compiler_Stmt.h) = f011a9b77f8a5b660334746925748eddee43ea32
+SHA1 (patch-compiler_SwitchStmt.h) = 924861787d5b162aa006ab2dcc9ec2cd13079a55
+SHA1 (patch-nqc_CmdLine.h) = 608ebff1017d20e016637f2b71f51a32fe0b3c48
diff --git a/devel/nqc/patches/patch-compiler_AsmStmt.h b/devel/nqc/patches/patch-compiler_AsmStmt.h
new file mode 100644
index 00000000000..9dede67702a
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_AsmStmt.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_AsmStmt.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/AsmStmt.h.orig	2011-11-25 20:15:13.000000000 +0000
++++ compiler/AsmStmt.h
+@@ -25,7 +25,8 @@
+ #include "RCX_Constants.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
+ 
+ class Field;
+ class Expr;
diff --git a/devel/nqc/patches/patch-compiler_Bytecode.h b/devel/nqc/patches/patch-compiler_Bytecode.h
new file mode 100644
index 00000000000..46522d764ee
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_Bytecode.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_Bytecode.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/Bytecode.h.orig	2011-11-25 20:15:22.000000000 +0000
++++ compiler/Bytecode.h
+@@ -37,7 +37,8 @@
+ #include "VarAllocator.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
+ 
+ class RCX_Cmd;
+ 
diff --git a/devel/nqc/patches/patch-compiler_CallStmt.h b/devel/nqc/patches/patch-compiler_CallStmt.h
new file mode 100644
index 00000000000..6a26597a327
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_CallStmt.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-compiler_CallStmt.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/CallStmt.h.orig	2011-11-25 20:16:35.000000000 +0000
++++ compiler/CallStmt.h
+@@ -25,8 +25,6 @@
+ #include "parser.h"
+ #endif
+ 
+-#include <vector.h>
+-
+ class Symbol;
+ class Expr;
+ 
diff --git a/devel/nqc/patches/patch-compiler_Compiler.h b/devel/nqc/patches/patch-compiler_Compiler.h
new file mode 100644
index 00000000000..ff0ad1b841d
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_Compiler.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_Compiler.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/Compiler.h.orig	2011-11-25 20:14:07.000000000 +0000
++++ compiler/Compiler.h
+@@ -17,7 +17,8 @@
+ #ifndef __Compiler_h
+ #define __Compiler_h
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
+ #include "RCX_Constants.h"
+ #include "RCX_Target.h"
+ 
diff --git a/devel/nqc/patches/patch-compiler_Expr.h b/devel/nqc/patches/patch-compiler_Expr.h
new file mode 100644
index 00000000000..becb91962f3
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_Expr.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-compiler_Expr.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/Expr.h.orig	2011-11-25 20:15:32.000000000 +0000
++++ compiler/Expr.h
+@@ -33,7 +33,9 @@
+ #include "LexLocation.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
++
+ class Bytecode;
+ class Mapping;
+ class RCX_Target;
diff --git a/devel/nqc/patches/patch-compiler_FunctionDef.h b/devel/nqc/patches/patch-compiler_FunctionDef.h
new file mode 100644
index 00000000000..6bc105f8f2a
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_FunctionDef.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_FunctionDef.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/FunctionDef.h.orig	2011-11-25 20:16:48.000000000 +0000
++++ compiler/FunctionDef.h
+@@ -26,7 +26,8 @@
+ #include "PListS.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
+ 
+ class Symbol;
+ class Stmt;
diff --git a/devel/nqc/patches/patch-compiler_Mapping.h b/devel/nqc/patches/patch-compiler_Mapping.h
new file mode 100644
index 00000000000..a3464ba9163
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_Mapping.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_Mapping.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/Mapping.h.orig	2011-11-25 20:17:32.000000000 +0000
++++ compiler/Mapping.h
+@@ -22,7 +22,8 @@
+ #include "Variable.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
+ 
+ class Expr;
+ 
diff --git a/devel/nqc/patches/patch-compiler_PreProc.h b/devel/nqc/patches/patch-compiler_PreProc.h
new file mode 100644
index 00000000000..7fcdccb2acb
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_PreProc.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_PreProc.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/PreProc.h.orig	2011-11-25 20:13:54.000000000 +0000
++++ compiler/PreProc.h
+@@ -33,7 +33,8 @@
+ #include "Conditional.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
+ 
+ class Symbol;
+ class Expansion;
diff --git a/devel/nqc/patches/patch-compiler_Program.h b/devel/nqc/patches/patch-compiler_Program.h
new file mode 100644
index 00000000000..cbe6318e3d1
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_Program.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-compiler_Program.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/Program.h.orig	2011-11-25 20:13:40.000000000 +0000
++++ compiler/Program.h
+@@ -41,7 +41,7 @@
+ #include "VarAllocator.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
+ 
+ class Fragment;
+ class FunctionDef;
diff --git a/devel/nqc/patches/patch-compiler_Scope.h b/devel/nqc/patches/patch-compiler_Scope.h
new file mode 100644
index 00000000000..896a37e5725
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_Scope.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-compiler_Scope.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/Scope.h.orig	2011-11-25 20:13:30.000000000 +0000
++++ compiler/Scope.h
+@@ -30,7 +30,9 @@
+ #include "AutoFree.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++
++using std::vector;
+ 
+ class Symbol;
+ 
diff --git a/devel/nqc/patches/patch-compiler_ScopeStmt.h b/devel/nqc/patches/patch-compiler_ScopeStmt.h
new file mode 100644
index 00000000000..39fdd368e26
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_ScopeStmt.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-compiler_ScopeStmt.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/ScopeStmt.h.orig	2011-11-25 20:17:18.000000000 +0000
++++ compiler/ScopeStmt.h
+@@ -21,8 +21,6 @@
+ #include "Stmt.h"
+ #endif
+ 
+-#include <vector.h>
+-
+ class ScopeStmt : public ChainStmt
+ {
+ public:
diff --git a/devel/nqc/patches/patch-compiler_Stmt.h b/devel/nqc/patches/patch-compiler_Stmt.h
new file mode 100644
index 00000000000..90cc1b11eda
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_Stmt.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-compiler_Stmt.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/Stmt.h.orig	2011-11-25 20:15:02.000000000 +0000
++++ compiler/Stmt.h
+@@ -25,7 +25,8 @@
+ #include "AutoFree.h"
+ #endif
+ 
+-#include <vector.h>
++#include <vector>
++using std::vector;
+ 
+ class Bytecode;
+ class CheckState;
diff --git a/devel/nqc/patches/patch-compiler_SwitchStmt.h b/devel/nqc/patches/patch-compiler_SwitchStmt.h
new file mode 100644
index 00000000000..982c910e553
--- /dev/null
+++ b/devel/nqc/patches/patch-compiler_SwitchStmt.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-compiler_SwitchStmt.h,v 1.1 2011/11/25 21:48:02 joerg Exp $
+
+--- compiler/SwitchStmt.h.orig	2011-11-25 20:16:57.000000000 +0000
++++ compiler/SwitchStmt.h
+@@ -25,8 +25,6 @@
+ #include "Expr.h"
+ #endif
+ 
+-#include <vector.h>
+-
+ class SwitchStmt : public ChainStmt
+ {
+ public:
diff --git a/devel/nqc/patches/patch-nqc_CmdLine.h b/devel/nqc/patches/patch-nqc_CmdLine.h
new file mode 100644
index 00000000000..0b601f89430
--- /dev/null
+++ b/devel/nqc/patches/patch-nqc_CmdLine.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-nqc_CmdLine.h,v 1.1 2011/11/25 21:48:03 joerg Exp $
+
+--- nqc/CmdLine.h.orig	2011-11-25 20:14:22.000000000 +0000
++++ nqc/CmdLine.h
+@@ -18,7 +18,9 @@
+ #define __CmdLine_h
+ 
+ #include <stdlib.h>
+-#include <vector.h>
++#include <vector>
++
++using std::vector;
+ 
+ class CmdLine
+ {