aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-29 23:25:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-01-04 19:27:21 +01:00
parent 477759217b
commit b02956196d
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/nel/include/nel/misc/common.h
View file

@ -39,7 +39,7 @@
#endif
#if defined(NL_CPU_INTEL) && defined(NL_COMP_GCC)
#include "x86intrin.h"
#include <x86intrin.h>
#endif
#include "string_common.h"
@ -69,8 +69,20 @@ namespace NLMISC
inline uint64 rdtsc()
{
// __rdtsc() is defined under all platforms
#if defined(NL_COMP_GCC) && !defined(CLANG_VERSION) && (GCC_VERSION <= 40405)
// for GCC versions that don't implement __rdtsc()
#ifdef NL_CPU_X86_64
uint64 low, high;
__asm__ volatile("rdtsc" : "=a" (low), "=d" (high));
return low | (high << 32);
#else
uint64 ticks;
__asm__ volatile("rdtsc" : "=A" (ticks));
return ticks;
#endif
#else
return uint64(__rdtsc());
#endif
}
#endif // NL_CPU_INTEL

4
code/nel/include/nel/misc/types_nl.h
View file

@ -191,6 +191,10 @@
# define NL_ISO_STDTR1_HEADER(header) <header>
# define NL_ISO_STDTR1_NAMESPACE std
# endif
# endif
// clang define GCC version for compatibility
# ifdef __clang__
# define CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
# endif
#endif