diff -Naur macosd-0.1.7/utility/include/template/ArgumentList.tcc macosd-0.1.7.patched/utility/include/template/ArgumentList.tcc
--- macosd-0.1.7/utility/include/template/ArgumentList.tcc	2004-06-17 17:33:03.000000000 +0200
+++ macosd-0.1.7.patched/utility/include/template/ArgumentList.tcc	2004-06-29 02:10:12.855629496 +0200
@@ -1,7 +1,7 @@
 
 #include "Compiler.hh"
 
-#if GCC_VERSION < 30400 || __INCLUDE_LEVEL__ == 1
+#if GCC_VERSION < 30400 && __INCLUDE_LEVEL__ == 1
 
 #ifndef UTILITY__ARGUMENTLIST_TCC__
 #define UTILITY__ARGUMENTLIST_TCC__
diff -Naur macosd-0.1.7/utility/include/template/Storage.tcc macosd-0.1.7.patched/utility/include/template/Storage.tcc
--- macosd-0.1.7/utility/include/template/Storage.tcc	2004-06-17 17:33:03.000000000 +0200
+++ macosd-0.1.7.patched/utility/include/template/Storage.tcc	2004-06-29 02:10:24.070924512 +0200
@@ -1,7 +1,7 @@
 
 #include "Compiler.hh"
 
-#if GCC_VERSION < 30400 || __INCLUDE_LEVEL__ == 1
+#if GCC_VERSION < 30400 && __INCLUDE_LEVEL__ == 1
 
 #ifndef UTILITY__STORAGE_TCC__
 #define UTILITY__STORAGE_TCC__