summaryrefslogtreecommitdiff
path: root/cpu.cpp
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2010-07-28 23:45:28 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2010-07-28 23:45:28 +0000
commitdd6b53792ce52a8e10d85d4420f3946d87419d44 (patch)
treebde360b98068b9d3a00a87fe84dd56f2e58edf53 /cpu.cpp
parentee715577df497906aa90034572677835e4702a76 (diff)
downloadcryptopp-dd6b53792ce52a8e10d85d4420f3946d87419d44.tar.gz
fix compile on Sun CC
fix compile for non-x86 CPUs git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@511 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'cpu.cpp')
-rwxr-xr-xcpu.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpu.cpp b/cpu.cpp
index 7a0079a..3610a7c 100755
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -32,6 +32,7 @@ bool CpuId(word32 input, word32 *output)
#else
#ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
+extern "C" {
typedef void (*SigHandler)(int);
static jmp_buf s_jmpNoCPUID;
@@ -45,6 +46,7 @@ static void SigIllHandlerSSE2(int)
{
longjmp(s_jmpNoSSE2, 1);
}
+}
#endif
bool CpuId(word32 input, word32 *output)
@@ -78,7 +80,7 @@ bool CpuId(word32 input, word32 *output)
result = false;
else
{
- __asm__
+ asm
(
// save ebx in case -fPIC is being used
#if CRYPTOPP_BOOL_X86