diff options
author | lloyd <[email protected]> | 2011-03-07 19:37:27 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2011-03-07 19:37:27 +0000 |
commit | 41da07c02a36add833965be5ddc60ef1cf089beb (patch) | |
tree | 0e5354046aefbe858ce39883e80d3a631720a3c6 /src | |
parent | c5aa9dcd36eb55a0d6b07966c6f7e92ce5d7cbe5 (diff) |
Tick to 1.9.15-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/entropy/hres_timer/hres_timer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/entropy/hres_timer/hres_timer.cpp b/src/entropy/hres_timer/hres_timer.cpp index b0bbf6fa7..ffe8eb8a9 100644 --- a/src/entropy/hres_timer/hres_timer.cpp +++ b/src/entropy/hres_timer/hres_timer.cpp @@ -47,7 +47,7 @@ void High_Resolution_Timestamp::poll(Entropy_Accumulator& accum) #elif defined(BOTAN_TARGET_ARCH_IS_ALPHA) asm volatile("rpcc %0" : "=r" (rtc)); -#elif defined(BOTAN_TARGET_ARCH_IS_SPARC64) +#elif defined(BOTAN_TARGET_ARCH_IS_SPARC64) && !defined(BOTAN_TARGET_OS_IS_OPENBSD) asm volatile("rd %%tick, %0" : "=r" (rtc)); #elif defined(BOTAN_TARGET_ARCH_IS_IA64) |