From ff4417a0cc344eed56d5ddd42b2a4cfd69b17c43 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <abaumann@yahoo.com>
Date: Sun, 16 Oct 2011 11:31:30 +0200
Subject: fixed for Linux 3.0, fixed a gcc warning about an unused variable

---
 makefiles/gmake/guess_env | 5 ++++-
 src/connection.cpp        | 2 +-
 src/port/sys_internal.h   | 9 +++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/makefiles/gmake/guess_env b/makefiles/gmake/guess_env
index 2e4f3de..136e21b 100755
--- a/makefiles/gmake/guess_env
+++ b/makefiles/gmake/guess_env
@@ -15,6 +15,9 @@ case "$UNAME_SYSTEM.$UNAME_RELEASE" in
 			if test -f /etc/arch-release; then
 				LINUX_DIST='arch'
 				LINUX_REV='current'
+				if test "$OS_MAJOR_VERSION" = "3"; then
+					OS_MINOR_VERSION=`echo $UNAME_RELEASE | cut -d . -f 2 | cut -d - -f 1`
+				fi
 			elif test -f /etc/debian_version; then
 				LINUX_DIST='debian'
 				LINUX_REV=`cat /etc/debian_version | cut -d . -f 1`
@@ -67,7 +70,7 @@ esac
 case "$UNAME_MACHINE" in
 	i*86*)		ARCH=x86
 			;;
-	x86_64)		ARCH=x86_64
+	x86_64|amd64)	ARCH=x86_64
 			;;
 	sun4u)		ARCH=sun4u
 			;;
diff --git a/src/connection.cpp b/src/connection.cpp
index 5db2e4d..4fab4f5 100644
--- a/src/connection.cpp
+++ b/src/connection.cpp
@@ -91,7 +91,7 @@ ostream& operator<<( ostream& o, const connection& c ) {
 result connection::exec( string sql ) {
 	ostringstream s;
 	s << "internal_" << *this << "_" << ++_internal_tno;
-	prepare::declaration decl = prepare( s.str( ), sql );
+	(void)prepare( s.str( ), sql );
 	return prepared_exec( s.str( ) );
 }
 
diff --git a/src/port/sys_internal.h b/src/port/sys_internal.h
index 5b6a0b2..b846810 100644
--- a/src/port/sys_internal.h
+++ b/src/port/sys_internal.h
@@ -32,8 +32,17 @@
 #else
 	#error unknown platform
 #endif /* defined OS_MINOR_VERSION == 6 */
+#else
+#if OS_MAJOR_VERSION == 3
+#if OS_MINOR_VERSION == 0
+#define _XOPEN_SOURCE 600
+#define HAVE_STRDUP
+#else
+        #error unknown platform
+#endif /* defined OS_MINOR_VERSION == 0 */
 #else
 	#error unknown platform
+#endif /* defined OS_MAJOR_VERSION == 3 */
 #endif /* defined OS_MAJOR_VERSION == 2 */
 #endif /* defined LINUX */
 
-- 
cgit v1.2.3-54-g00ecf