[patch] patch for gcc-4.4

vegastrike-gcc44.patch (text/plain), 3.66 KB, created by quazgar on 2010-01-01 16:27:33 UTC

--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/apply.hpp	2009-07-17 20:59:40.929382133 +0200
+++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/apply.hpp	2009-07-17 21:00:07.756110500 +0200
@@ -134,8 +134,10 @@
 #endif // BOOST_MPL_APPLY_HPP_INCLUDED
 
 ///// iteration, depth == 1
-
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+// For gcc 4.4 compatability, we must include the
+// BOOST_PP_ITERATION_DEPTH test inside an #else clause.
+#else // BOOST_PP_IS_ITERATING
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -222,4 +224,5 @@
 
 #   undef i_
 
+#endif // BOOST_PP_ITERATION_DEPTH()
 #endif // BOOST_PP_IS_ITERATING
diff -urN vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/apply_wrap.hpp vegastrike-source-0.5.0/boost/1_33/boost/mpl/apply_wrap.hpp
--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/apply_wrap.hpp	2009-07-17 20:59:40.996047661 +0200
+++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/apply_wrap.hpp	2009-07-17 21:00:07.756110500 +0200
@@ -78,7 +78,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -197,4 +198,5 @@
 
 #   undef j_
 
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/full_lambda.hpp vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/full_lambda.hpp
--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/full_lambda.hpp	2009-07-17 20:59:40.599381331 +0200
+++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/full_lambda.hpp	2009-07-17 21:00:07.766878419 +0200
@@ -227,7 +227,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 #define i_ BOOST_PP_FRAME_ITERATION(1)
 
 #if i_ > 0
@@ -347,4 +348,5 @@
 };
 
 #undef i_
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/numeric_op.hpp vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/numeric_op.hpp
--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/aux_/numeric_op.hpp	2009-07-17 20:59:40.599381331 +0200
+++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/aux_/numeric_op.hpp	2009-07-17 21:00:07.766878419 +0200
@@ -287,7 +287,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -308,4 +309,5 @@
 
 #   undef i_
 
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/bind.hpp vegastrike-source-0.5.0/boost/1_33/boost/mpl/bind.hpp
--- vegastrike-source-0.5.0.orig/boost/1_33/boost/mpl/bind.hpp	2009-07-17 20:59:40.589380757 +0200
+++ vegastrike-source-0.5.0/boost/1_33/boost/mpl/bind.hpp	2009-07-17 21:00:07.766878419 +0200
@@ -361,7 +361,8 @@
 
 ///// iteration, depth == 1
 
-#elif BOOST_PP_ITERATION_DEPTH() == 1
+#else
+#if BOOST_PP_ITERATION_DEPTH() == 1
 
 #   define i_ BOOST_PP_FRAME_ITERATION(1)
 
@@ -544,4 +545,5 @@
 #   endif
 #   undef j_
 
+#endif
 #endif // BOOST_PP_IS_ITERATING
diff -urN vegastrike-source-0.5.0.orig/src/cmd/basecomputer.cpp vegastrike-source-0.5.0/src/cmd/basecomputer.cpp
--- vegastrike-source-0.5.0.orig/src/cmd/basecomputer.cpp	2009-07-17 20:59:40.166058029 +0200
+++ vegastrike-source-0.5.0/src/cmd/basecomputer.cpp	2009-07-17 21:06:02.696008744 +0200
@@ -3142,7 +3142,7 @@
 	return s1.st_mtime - s2.st_mtime;
 }
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if (__GLIBC__>2 || __GLIBC_MINOR__>=10) || (defined(_WIN32) && !defined(CYGWIN)) 
 typedef int (*scancompare) ( const struct dirent **v1, const struct dirent **v2 );
 #else
 typedef int (*scancompare) ( const void *v1, const void *v2 );