Fix some, but not all issues with GCC 3.4.

2 files changed, 80 insertions, 0 deletions

diff --git a/emulators/palmosemulator/patches/patch-ao b/emulators/palmosemulator/patches/patch-ao
new file mode 100644
index 00000000000..7c15497a9c4
--- /dev/null
+++ b/emulators/palmosemulator/patches/patch-ao
@@ -0,0 +1,58 @@
+$NetBSD: patch-ao,v 1.1 2006/04/28 13:52:06 joerg Exp $
+
+--- SrcShared/EmStream.h.orig	2006-04-28 12:41:47.000000000 +0000
++++ SrcShared/EmStream.h
+@@ -90,7 +90,7 @@ class EmStream
+ 
+ 									container.resize (numElements);
+ 
+-									deque<T>::iterator	iter = container.begin ();
++									typename deque<T>::iterator	iter = container.begin ();
+ 									while (iter != container.end ())
+ 									{
+ 										*this >> *iter;
+@@ -108,7 +108,7 @@ class EmStream
+ 
+ 									container.resize (numElements);
+ 
+-									list<T>::iterator	iter = container.begin ();
++									typename list<T>::iterator	iter = container.begin ();
+ 									while (iter != container.end ())
+ 									{
+ 										*this >> *iter;
+@@ -126,7 +126,7 @@ class EmStream
+ 
+ 									container.resize (numElements);
+ 
+-									vector<T>::iterator	iter = container.begin ();
++									typename vector<T>::iterator	iter = container.begin ();
+ 									while (iter != container.end ())
+ 									{
+ 										*this >> *iter;
+@@ -143,7 +143,7 @@ class EmStream
+ 
+ 									*this << numElements;
+ 
+-									deque<T>::const_iterator	iter = container.begin ();
++									typename deque<T>::const_iterator	iter = container.begin ();
+ 									while (iter != container.end ())
+ 									{
+ 										*this << *iter;
+@@ -160,7 +160,7 @@ class EmStream
+ 
+ 									*this << numElements;
+ 
+-									list<T>::const_iterator	iter = container.begin ();
++									typename list<T>::const_iterator	iter = container.begin ();
+ 									while (iter != container.end ())
+ 									{
+ 										*this << *iter;
+@@ -177,7 +177,7 @@ class EmStream
+ 
+ 									*this << numElements;
+ 
+-									vector<T>::const_iterator	iter = container.begin ();
++									typename vector<T>::const_iterator	iter = container.begin ();
+ 									while (iter != container.end ())
+ 									{
+ 										*this << *iter;
diff --git a/emulators/palmosemulator/patches/patch-ap b/emulators/palmosemulator/patches/patch-ap
new file mode 100644
index 00000000000..a6077279dd8
--- /dev/null
+++ b/emulators/palmosemulator/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1 2006/04/28 13:52:06 joerg Exp $
+
+--- SrcShared/Miscellaneous.cpp.orig	2006-04-28 13:19:44.000000000 +0000
++++ SrcShared/Miscellaneous.cpp
+@@ -2687,7 +2687,7 @@ void FormatInteger (char* dest, uint32 i
+ 	// Get the thousands separator character(s).
+ 
+ 	struct lconv*	locale_data = localeconv ();
+-	char*			thousands_sep = locale_data->thousands_sep;
++	const char*	thousands_sep = locale_data->thousands_sep;
+ 
+ 	if (strlen (thousands_sep) == 0)
+ 	{
+@@ -2747,7 +2747,7 @@ string FormatInteger (uint32 integer)
+ 	// Get the thousands separator character(s).
+ 
+ 	struct lconv*	locale_data = localeconv ();
+-	char*			thousands_sep = locale_data->thousands_sep;
++	const char*	thousands_sep = locale_data->thousands_sep;
+ 
+ 	if (strlen (thousands_sep) == 0)
+ 	{