diff options
| author | rubidium <rubidium@openttd.org> | 2008-11-26 01:03:34 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-11-26 01:03:34 +0000 |
| commit | 69eb6978e76dd97df4dc3f9b937012c91553303b (patch) | |
| tree | c7bb2ccf1b951ef42bb8daacbd94423ff6b74c4f /src/yapf/yapf.hpp | |
| parent | 131f9e39d3ade7052c23bda339a66d32b354b9c8 (diff) | |
| download | openttd-69eb6978e76dd97df4dc3f9b937012c91553303b.tar.xz | |
(svn r14634) -Change: _rdtsc is defined by some platforms so we can't use that name.
Diffstat (limited to 'src/yapf/yapf.hpp')
| -rw-r--r-- | src/yapf/yapf.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/yapf/yapf.hpp b/src/yapf/yapf.hpp index bdd975e8c..758d4d459 100644 --- a/src/yapf/yapf.hpp +++ b/src/yapf/yapf.hpp @@ -23,7 +23,7 @@ #include "../settings_type.h" #include "../tunnelbridge.h" -extern uint64 _rdtsc(); +extern uint64 ottd_rdtsc(); #include <limits.h> #include <new> @@ -45,7 +45,7 @@ struct CPerformanceTimer FORCEINLINE void Stop() {m_acc += QueryTime() - m_start;} FORCEINLINE int Get(int64 coef) {return (int)(m_acc * coef / QueryFrequency());} - FORCEINLINE int64 QueryTime() {return _rdtsc();} + FORCEINLINE int64 QueryTime() {return ottd_rdtsc();} FORCEINLINE int64 QueryFrequency() {return ((int64)2200 * 1000000);} }; |