From 4583e435b409fffd6b932fb2150390e9ef76a6a1 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Sat, 24 Feb 2007 14:23:03 +0000
Subject: [PATCH] Workaround for GCC 3.4.5/gentoo bug: define GCFG_NO_CPUID

---
 Config.def                | 2 ++
 goldlib/gall/gutlvers.cpp | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Config.def b/Config.def
index 422f9ff..3dd310d 100644
--- a/Config.def
+++ b/Config.def
@@ -83,3 +83,5 @@
 #CPPFLAGS+=-DGCFG_NO_REGEX
 # Comment to disable AreaRecycleBin keyword and feature
 CPPFLAGS+=-D__INCLUDE_NEW_KEYWORDS__
+# Uncomment to disable CPUID feature (compilation error in goldlib/gall/gutlvers.cpp)
+#CPPFLAGS+=-DGCFG_NO_CPUID
diff --git a/goldlib/gall/gutlvers.cpp b/goldlib/gall/gutlvers.cpp
index 6c91584..e5496d7 100644
--- a/goldlib/gall/gutlvers.cpp
+++ b/goldlib/gall/gutlvers.cpp
@@ -49,7 +49,10 @@
 #define _MAX_VNAME_LEN  12
 #define _MAX_MNAME_LEN  30
 
-
+#ifdef GCFG_NO_CPUID
+# define gcpuid(pstr) (pstr)
+# define HaveCPUID()  (0)
+#else
 //  ------------------------------------------------------------------
 
 #if defined(_MSC_VER) && (_MSC_VER < 1400)
@@ -549,7 +552,7 @@ char *gcpuid(char *_cpuname)
 
   return _cpuname;
 }
-
+#endif // ifdef GCFG_NO_CPUID
 
 //  ------------------------------------------------------------------