Workaround for GCC 3.4.5/gentoo bug: define GCFG_NO_CPUID
This commit is contained in:
parent
a995b8f196
commit
4583e435b4
@ -83,3 +83,5 @@
|
|||||||
#CPPFLAGS+=-DGCFG_NO_REGEX
|
#CPPFLAGS+=-DGCFG_NO_REGEX
|
||||||
# Comment to disable AreaRecycleBin keyword and feature
|
# Comment to disable AreaRecycleBin keyword and feature
|
||||||
CPPFLAGS+=-D__INCLUDE_NEW_KEYWORDS__
|
CPPFLAGS+=-D__INCLUDE_NEW_KEYWORDS__
|
||||||
|
# Uncomment to disable CPUID feature (compilation error in goldlib/gall/gutlvers.cpp)
|
||||||
|
#CPPFLAGS+=-DGCFG_NO_CPUID
|
||||||
|
@ -49,7 +49,10 @@
|
|||||||
#define _MAX_VNAME_LEN 12
|
#define _MAX_VNAME_LEN 12
|
||||||
#define _MAX_MNAME_LEN 30
|
#define _MAX_MNAME_LEN 30
|
||||||
|
|
||||||
|
#ifdef GCFG_NO_CPUID
|
||||||
|
# define gcpuid(pstr) (pstr)
|
||||||
|
# define HaveCPUID() (0)
|
||||||
|
#else
|
||||||
// ------------------------------------------------------------------
|
// ------------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(_MSC_VER) && (_MSC_VER < 1400)
|
#if defined(_MSC_VER) && (_MSC_VER < 1400)
|
||||||
@ -549,7 +552,7 @@ char *gcpuid(char *_cpuname)
|
|||||||
|
|
||||||
return _cpuname;
|
return _cpuname;
|
||||||
}
|
}
|
||||||
|
#endif // ifdef GCFG_NO_CPUID
|
||||||
|
|
||||||
// ------------------------------------------------------------------
|
// ------------------------------------------------------------------
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user