From fbf018598efa08dae3012220a71b2b5019d5cebb Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Mon, 1 Dec 2003 18:56:53 +0000
Subject: [PATCH] Rename IRIX to irix_string in simgear/compatibility and
 assign "simgear/compatibility/irix_string" to STL_STRING for IRIX

---
 simgear/compatibility/Makefile.am           | 2 +-
 simgear/compatibility/{IRIX => irix_string} | 8 ++++++--
 simgear/compiler.h                          | 4 +---
 simgear/misc/tabbed_values.hxx              | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename simgear/compatibility/{IRIX => irix_string} (88%)

diff --git a/simgear/compatibility/Makefile.am b/simgear/compatibility/Makefile.am
index 7cdc91e4..404ebfc7 100644
--- a/simgear/compatibility/Makefile.am
+++ b/simgear/compatibility/Makefile.am
@@ -30,4 +30,4 @@ include_HEADERS	= \
 	new \
 	streambuf \
 	\
-	IRIX
+	irix_string
diff --git a/simgear/compatibility/IRIX b/simgear/compatibility/irix_string
similarity index 88%
rename from simgear/compatibility/IRIX
rename to simgear/compatibility/irix_string
index 1711739d..1b49dd74 100644
--- a/simgear/compatibility/IRIX
+++ b/simgear/compatibility/irix_string
@@ -1,6 +1,8 @@
 
 #ifndef __SGI_HXX
-#define __SGI_HXX
+#define __SGI_HXX 1
+
+#ifdef __cplusplus
 
 #include <string>
 
@@ -40,4 +42,6 @@ operator+(const char* lhs, const std::string& rhs)
     return std::string(lhs) + rhs;
 }
 
-#endif // !__SGI_HXX
+#endif /* __cplusplus */
+
+#endif /* !__SGI_HXX */
diff --git a/simgear/compiler.h b/simgear/compiler.h
index d2873230..f80697d5 100644
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -290,8 +290,6 @@
 #if defined ( sgi ) && !defined( __GNUC__ )
 #  define SG_HAVE_NATIVE_SGI_COMPILERS
 
-#include <simgear/compatibility/IRIX>
-
 #  define SG_EXPLICIT_FUNCTION_TMPL_ARGS
 #  define SG_CLASS_PARTIAL_SPECIALIZATION
 #  define SG_NEED_AUTO_PTR
@@ -309,7 +307,7 @@
 #  define STL_ITERATOR   <iterator>
 #  define STL_FSTREAM    <fstream>
 #  define STL_STDEXCEPT  <stdexcept>
-#  define STL_STRING     <string>
+#  define STL_STRING     <simgear/compatibility/irix_string>
 #  define STL_STRSTREAM  <strstream>
 
 #pragma set woff 1001,1012,1014,1116,1155,1172,1174
diff --git a/simgear/misc/tabbed_values.hxx b/simgear/misc/tabbed_values.hxx
index 895e62b8..c66d306b 100644
--- a/simgear/misc/tabbed_values.hxx
+++ b/simgear/misc/tabbed_values.hxx
@@ -1,10 +1,10 @@
 #ifndef SG_TABBED_VALUES_HXX
 #define SG_TABBED_VALUES_HXX
 
-#include <vector>
-#include <string>
+#include <simgear/compiler.h>
 
-#include "simgear/compiler.h"
+#include <vector>
+#include STL_STRING
 
 SG_USING_STD(vector);
 SG_USING_STD(string);
-- 
2.39.5