From c7000cc7b3746aca453b9d875d389ed8eae65067 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sat, 21 Aug 2004 08:55:12 +0000
Subject: [PATCH] - fixed some issues when compiling with gcc-2.95.3. At least
 three more   problems remain, though.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8615 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/file_systems/udf/Icb.h                | 6 ++++--
 src/kernel/libroot/posix/glibc/include/arch/x86/config.h | 6 +++++-
 src/tests/kits/interface/GraphicsDefsTest.cpp            | 8 ++++----
 src/tools/rc/Jamfile                                     | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/udf/Icb.h b/src/add-ons/kernel/file_systems/udf/Icb.h
index e0d141eada..d764b1f490 100644
--- a/src/add-ons/kernel/file_systems/udf/Icb.h
+++ b/src/add-ons/kernel/file_systems/udf/Icb.h
@@ -120,8 +120,10 @@ private:
 	status_t fInitStatus;
 	vnode_id fId;
 	SinglyLinkedList<DirectoryIterator*> fIteratorList;
-	FileEntry<file_icb_entry> fFileEntry;
-	FileEntry<extended_file_icb_entry> fExtendedEntry;	
+	/* [zooey]: gcc-2.95.3 requires the explicit namespace here, otherwise
+	   it complains about a syntax error(!). This is most probably a bug. */
+	Udf::FileEntry<file_icb_entry> fFileEntry;
+	Udf::FileEntry<extended_file_icb_entry> fExtendedEntry;	
 };
 
 /*! \brief Does the dirty work of reading using the given DescriptorList object
diff --git a/src/kernel/libroot/posix/glibc/include/arch/x86/config.h b/src/kernel/libroot/posix/glibc/include/arch/x86/config.h
index d4a45ec03a..aed6e20f4a 100644
--- a/src/kernel/libroot/posix/glibc/include/arch/x86/config.h
+++ b/src/kernel/libroot/posix/glibc/include/arch/x86/config.h
@@ -39,7 +39,11 @@
 #undef	HAVE_INITFINI
 
 /* Define if __attribute__((section("foo"))) puts quotes around foo.  */
-#define	HAVE_SECTION_QUOTES 1
+/*#define	HAVE_SECTION_QUOTES 1
+ [zooey]: defining this causes assembler errors, and I don't think
+          that any BeOS-gcc actually produces quotes in sections...
+*/
+#undef	HAVE_SECTION_QUOTES
 
 /* Define if using the GNU assembler, gas.  */
 #define	HAVE_GNU_AS 1
diff --git a/src/tests/kits/interface/GraphicsDefsTest.cpp b/src/tests/kits/interface/GraphicsDefsTest.cpp
index 0f64627e01..63968f58ba 100644
--- a/src/tests/kits/interface/GraphicsDefsTest.cpp
+++ b/src/tests/kits/interface/GraphicsDefsTest.cpp
@@ -32,12 +32,12 @@ const uint32 _B_TRANSPARENT_MAGIC_RGBA32_BIG = 0x77747700;
 // misc.
 const struct screen_id _B_MAIN_SCREEN_ID = {0};
 
-template<class T> void compare(T a, T b);
+template<class T> void compare(T &a, T &b);
 
 
 template<>
 void
-compare<pattern>(const pattern &a, const pattern &b)
+compare<const pattern>(const pattern &a, const pattern &b)
 {
 	for (int32 i = 0; i < 8; i++)
 		CHK(a.data[i] == b.data[i]);
@@ -46,7 +46,7 @@ compare<pattern>(const pattern &a, const pattern &b)
 
 template<>
 void
-compare<rgb_color>(const rgb_color a, const rgb_color b)
+compare<const rgb_color>(const rgb_color &a, const rgb_color &b)
 {
 	CHK(a.red == b.red);
 	CHK(a.green == b.green);
@@ -57,7 +57,7 @@ compare<rgb_color>(const rgb_color a, const rgb_color b)
 
 template<class T>
 void
-compare(T a, T b)
+compare(T &a, T &b)
 {
 	CHK(a == b);
 }
diff --git a/src/tools/rc/Jamfile b/src/tools/rc/Jamfile
index f00b92b763..2376e087da 100644
--- a/src/tools/rc/Jamfile
+++ b/src/tools/rc/Jamfile
@@ -6,7 +6,7 @@ GENERATE_C++ on [ FGristFiles lexer.l parser.y ] = true ;
 	SubDirC++Flags -Wno-sign-compare -Wno-unused ;
 }
 
-SharedLibrary rdef : compile.cpp decompile.cpp lexer.l parser.y rdef.cpp : be ;
+SharedLibrary rdef : compile.cpp decompile.cpp lexer.l parser.y rdef.cpp : be stdc++.r4 ;
 AbsSymLink <boot!home!config!lib>librdef.so : librdef.so
 		   : /boot/home/config/lib : false ;