From 8b4c64130adce8711a691c34d709f974df9ce1b6 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Wed, 28 Jan 2004 20:39:44 +0000
Subject: [PATCH] C++ and preprocessor fixes for gcc3; partly from FreeBSD

---
 java/jlint/patches/patch-Makefile      |  8 ++++----
 java/jlint/patches/patch-field_desc_hh | 16 ++++++++++++++++
 java/jlint/patches/patch-jlint_cc      | 12 ++++++++++++
 java/jlint/patches/patch-types_hh      | 15 +++++++++++++++
 4 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 java/jlint/patches/patch-field_desc_hh
 create mode 100644 java/jlint/patches/patch-jlint_cc
 create mode 100644 java/jlint/patches/patch-types_hh

diff --git a/java/jlint/patches/patch-Makefile b/java/jlint/patches/patch-Makefile
index 0c7c1028435..7fdebd05c3f 100644
--- a/java/jlint/patches/patch-Makefile
+++ b/java/jlint/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.2 2002/09/28 22:30:10 naddy Exp $
---- Makefile.orig	Wed Aug  8 19:38:28 2001
-+++ Makefile	Sun Sep 29 00:32:47 2002
+$OpenBSD: patch-Makefile,v 1.3 2004/01/28 20:39:44 naddy Exp $
+--- Makefile.orig	2001-08-08 19:38:28.000000000 +0200
++++ Makefile	2004-01-28 21:31:25.000000000 +0100
 @@ -3,8 +3,8 @@
  # Makefile for Unix and GNU/Linux with gcc/g++ compiler
  # Edit here:
@@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile,v 1.2 2002/09/28 22:30:10 naddy Exp $
  # Optimized version
  
 -CFLAGS = -c -Wall -O2 -g -DSLIST
-+CFLAGS += -DSLIST -c
++CFLAGS += -c
  # add -DHASH_TABLE for extra speed (may sometimes produce inconsistent results)
  
  # Optimized version with switched off asserts
diff --git a/java/jlint/patches/patch-field_desc_hh b/java/jlint/patches/patch-field_desc_hh
new file mode 100644
index 00000000000..891e12ea39b
--- /dev/null
+++ b/java/jlint/patches/patch-field_desc_hh
@@ -0,0 +1,16 @@
+$OpenBSD: patch-field_desc_hh,v 1.1 2004/01/28 20:39:44 naddy Exp $
+--- field_desc.hh.orig	2004-01-28 21:24:08.000000000 +0100
++++ field_desc.hh	2004-01-28 21:24:21.000000000 +0100
+@@ -2,10 +2,11 @@
+ #define FIELD_DESC_HH
+ 
+ #ifdef VISUAL_CPP
+-using namespace std;
+ #pragma warning (disable : 4786)
+ #endif
+ 
++using namespace std;
++
+ #include "component_desc.hh"
+ #include "utf_string.hh"
+ class const_name_and_type;
diff --git a/java/jlint/patches/patch-jlint_cc b/java/jlint/patches/patch-jlint_cc
new file mode 100644
index 00000000000..73b99acde65
--- /dev/null
+++ b/java/jlint/patches/patch-jlint_cc
@@ -0,0 +1,12 @@
+$OpenBSD: patch-jlint_cc,v 1.1 2004/01/28 20:39:44 naddy Exp $
+--- jlint.cc.orig	2004-01-28 21:32:42.000000000 +0100
++++ jlint.cc	2004-01-28 21:33:12.000000000 +0100
+@@ -37,7 +37,7 @@ field_desc* is_const;
+ 
+ message_descriptor msg_table[] = {
+ #define MSG(category, code, position_dependent, format) \
+-{cat_##category, MSG_LOCATION_PREFIX##format, #code, position_dependent, true},
++{cat_##category, MSG_LOCATION_PREFIX format, #code, position_dependent, true},
+ #include "jlint.msg"
+   {cat_all}
+ };
diff --git a/java/jlint/patches/patch-types_hh b/java/jlint/patches/patch-types_hh
new file mode 100644
index 00000000000..3e6820b2d7e
--- /dev/null
+++ b/java/jlint/patches/patch-types_hh
@@ -0,0 +1,15 @@
+$OpenBSD: patch-types_hh,v 1.1 2004/01/28 20:39:44 naddy Exp $
+--- types.hh.orig	2004-01-28 21:25:25.000000000 +0100
++++ types.hh	2004-01-28 21:25:33.000000000 +0100
+@@ -2,10 +2,10 @@
+ #define TYPES_HH
+ 
+ #ifdef VISUAL_CPP
+-#include <assert.h>
+ #pragma warning( disable : 4786)
+ #endif
+ 
++#include <cassert>
+ #include <string>
+ #include <vector>
+