From 4b70b53758227892814586a5572bb12aeedad9ec Mon Sep 17 00:00:00 2001
From: Graeme Walker <graeme_walker@users.sourceforge.net>
Date: Sat, 22 Aug 2009 12:00:00 +0000
Subject: [PATCH] v1.8.2

---
 ChangeLog                  | 4 ++++
 src/glib/glogoutput.cpp    | 3 ++-
 src/glib/gprocess_unix.cpp | 3 ++-
 src/gnet/gsimpleclient.cpp | 1 +
 src/gui/installer.cpp      | 1 +
 src/main/main.cpp          | 1 +
 src/main/passwd.cpp        | 1 +
 src/main/submit.cpp        | 1 +
 8 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a5fac49..0d68702 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 E-MailRelay Change Log
 ======================
 
+1.8.1 -> 1.8.2
+--------------
+* Fix namespaces for gcc 3.4.
+
 1.8 -> 1.8.1
 ------------
 * Changed the definition of "--as-proxy" to use "--poll 0" rather than "--immediate" [bug-id 1961652].
diff --git a/src/glib/glogoutput.cpp b/src/glib/glogoutput.cpp
index 08c5466..c4c60b9 100644
--- a/src/glib/glogoutput.cpp
+++ b/src/glib/glogoutput.cpp
@@ -24,6 +24,7 @@
 #include <sstream>
 #include <string>
 #include <ctime>
+#include <cstdlib>
 
 // (note that the implementation here has to be reentrant and using only the standard runtime library)
 
@@ -223,7 +224,7 @@ void G::LogOutput::doAssertion( const char * file , int line , const std::string
 
 void G::LogOutput::halt()
 {
-	abort() ;
+	::abort() ;
 }
 
 std::string G::LogOutput::levelString( Log::Severity s )
diff --git a/src/glib/gprocess_unix.cpp b/src/glib/gprocess_unix.cpp
index 059fae8..56804c2 100644
--- a/src/glib/gprocess_unix.cpp
+++ b/src/glib/gprocess_unix.cpp
@@ -26,6 +26,7 @@
 #include "gfs.h"
 #include "glog.h"
 #include <iostream>
+#include <cstring> // std::strerror()
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -122,7 +123,7 @@ int G::Process::errno_( int e )
 
 std::string G::Process::strerror( int errno_ )
 {
-	char * p = ::strerror( errno_ ) ;
+	char * p = std::strerror( errno_ ) ;
 	return std::string( p ? p : "" ) ;
 }
 
diff --git a/src/gnet/gsimpleclient.cpp b/src/gnet/gsimpleclient.cpp
index da3537d..47e3586 100644
--- a/src/gnet/gsimpleclient.cpp
+++ b/src/gnet/gsimpleclient.cpp
@@ -32,6 +32,7 @@
 #include "gtest.h"
 #include "gdebug.h"
 #include "glog.h"
+#include <cstdlib>
 
 namespace
 {
diff --git a/src/gui/installer.cpp b/src/gui/installer.cpp
index b92b98d..a3fea30 100644
--- a/src/gui/installer.cpp
+++ b/src/gui/installer.cpp
@@ -51,6 +51,7 @@
 #include <map>
 #include <set>
 #include <list>
+#include <cstdlib>
 
 #ifdef CreateDirectory
 #undef CreateDirectory
diff --git a/src/main/main.cpp b/src/main/main.cpp
index cdc512a..60987d3 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -25,6 +25,7 @@
 #include "run.h"
 #include "commandline.h"
 #include <exception>
+#include <cstdlib>
 
 /// \class App
 /// An implementation of the Main::Output abstract interface
diff --git a/src/main/passwd.cpp b/src/main/passwd.cpp
index 19aefea..9ed3d44 100644
--- a/src/main/passwd.cpp
+++ b/src/main/passwd.cpp
@@ -31,6 +31,7 @@
 #include "gmd5.h"
 #include "legal.h"
 #include <iostream>
+#include <cstdlib>
 
 int main( int argc , char * argv [] )
 {
diff --git a/src/main/submit.cpp b/src/main/submit.cpp
index 166b60d..4542a6e 100644
--- a/src/main/submit.cpp
+++ b/src/main/submit.cpp
@@ -54,6 +54,7 @@
 #include <exception>
 #include <iostream>
 #include <memory>
+#include <cstdlib>
 
 G_EXCEPTION( NoBody , "no body text" ) ;