C++ and preprocessor fixes for gcc3; partly from FreeBSD

This commit is contained in:
naddy 2004-01-28 20:39:44 +00:00
parent 50b3ab6c55
commit 8b4c64130a
4 changed files with 47 additions and 4 deletions

View File

@ -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

View File

@ -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;

View File

@ -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}
};

View File

@ -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>