projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
698466a
)
x86_64 compilation fixes.
author
Pekka Riikonen
<priikone@silcnet.org>
Sun, 9 Dec 2007 15:41:33 +0000
(15:41 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Sun, 9 Dec 2007 15:41:33 +0000
(15:41 +0000)
lib/silcutil/silctimer.h
patch
|
blob
|
history
diff --git
a/lib/silcutil/silctimer.h
b/lib/silcutil/silctimer.h
index b68cffe315c96bada1eae13d44ce6a955b82b38c..f2db83050fb6f4be4c0ff11cd9c238ff8683b3c1 100644
(file)
--- a/
lib/silcutil/silctimer.h
+++ b/
lib/silcutil/silctimer.h
@@
-193,19
+193,19
@@
static inline
SilcUInt64 silc_timer_tick(SilcTimer timer, SilcBool adjust)
{
#if defined(__GNUC__) || defined(__ICC)
SilcUInt64 silc_timer_tick(SilcTimer timer, SilcBool adjust)
{
#if defined(__GNUC__) || defined(__ICC)
-#if
def SILC_I486
+#if
defined(SILC_I486)
SilcUInt64 x;
asm volatile ("rdtsc" : "=A" (x));
return adjust ? x - timer->sync_tdiff : x;
SilcUInt64 x;
asm volatile ("rdtsc" : "=A" (x));
return adjust ? x - timer->sync_tdiff : x;
-#elif
SILC_X86_64
+#elif
defined(SILC_X86_64)
SilcUInt64 x;
SilcUInt32 hi, lo;
asm volatile ("rdtsc" : "=a" (lo), "=d" (hi));
x = ((SilcUInt64)lo | ((SilcUInt64)hi << 32));
return adjust ? x - timer->sync_tdiff : x;
SilcUInt64 x;
SilcUInt32 hi, lo;
asm volatile ("rdtsc" : "=a" (lo), "=d" (hi));
x = ((SilcUInt64)lo | ((SilcUInt64)hi << 32));
return adjust ? x - timer->sync_tdiff : x;
-#elif
SILC_POWERPC
+#elif
defined(SILC_POWERPC)
SilcUInt32 hi, lo, tmp;
asm volatile ("0: \n\t"
"mftbu %0 \n\t"
SilcUInt32 hi, lo, tmp;
asm volatile ("0: \n\t"
"mftbu %0 \n\t"