mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-18 19:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dep/g3dlite/G3D/System.cpp
View file

@ -531,11 +531,7 @@ static bool checkForCPUID() {
// add cases for incompatible architectures if they are added
// e.g., if we ever support __powerpc__ being defined again
#if defined(__arm__)
return false;
#else
return true;
#endif
return true;
}
@ -1740,15 +1736,6 @@ void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, ui
edx = 0;
}
#elif defined(G3D_LINUX) && defined(__arm__)
// non-x86 CPU; no CPUID, at least in userspace
void System::cpuid(CPUIDFunction func, uint32& eax, uint32& ebx, uint32& ecx, uint32& edx) {
eax = 0;
ebx = 0;
ecx = 0;
edx = 0;
}
#else
// See http://sam.zoy.org/blog/2007-04-13-shlib-with-non-pic-code-have-inline-assembly-and-pic-mix-well