diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2017-09-11 22:39:59 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2017-09-11 22:39:59 -0400 |
| commit | 9c9d5ebe8702c69aec7488b511475eefe33ba862 (patch) | |
| tree | bec22c1b5d6d84665725df4561d1d1566b7bc159 /ppc-simd.cpp | |
| parent | 120b415e27c4fcf8f67adb2ec2e30628742580c2 (diff) | |
| download | cryptopp-git-9c9d5ebe8702c69aec7488b511475eefe33ba862.tar.gz | |
Undef vector, bool and pixel
Diffstat (limited to 'ppc-simd.cpp')
| -rw-r--r-- | ppc-simd.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ppc-simd.cpp b/ppc-simd.cpp index e158a1c4..d4c43b56 100644 --- a/ppc-simd.cpp +++ b/ppc-simd.cpp @@ -23,10 +23,11 @@ # undef CRYPTOPP_POWER8_CRYPTO_AVAILABLE
#endif
-// We can't use bool return type because early Apple systems,
-// like G5's, perform '#define bool __bool' in <altivec.h>.
#if defined(CRYPTOPP_ALTIVEC_AVAILABLE)
# include "altivec.h"
+# undef vector
+# undef pixel
+# undef bool
#endif
#if defined(CRYPTOPP_ALTIVEC_AVAILABLE)
@@ -63,7 +64,7 @@ extern "C" { };
#endif // Not CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
-int CPU_ProbeAltivec()
+bool CPU_ProbeAltivec()
{
#if (CRYPTOPP_ALTIVEC_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
@@ -113,7 +114,7 @@ int CPU_ProbeAltivec() }
#if 0
-int CPU_ProbePower7()
+bool CPU_ProbePower7()
{
#if (CRYPTOPP_POWER7_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
@@ -157,7 +158,7 @@ int CPU_ProbePower7() }
#endif
-int CPU_ProbePower8()
+bool CPU_ProbePower8()
{
#if (CRYPTOPP_POWER8_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
@@ -200,7 +201,7 @@ int CPU_ProbePower8() #endif // CRYPTOPP_ALTIVEC_AVAILABLE
}
-int CPU_ProbeAES()
+bool CPU_ProbeAES()
{
#if (CRYPTOPP_POWER8_AES_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
@@ -251,7 +252,7 @@ int CPU_ProbeAES() #endif // CRYPTOPP_ALTIVEC_AVAILABLE
}
-int CPU_ProbeSHA1()
+bool CPU_ProbeSHA1()
{
#if (CRYPTOPP_ALTIVEC_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
@@ -284,7 +285,7 @@ int CPU_ProbeSHA1() #endif // CRYPTOPP_ALTIVEC_AVAILABLE
}
-int CPU_ProbeSHA2()
+bool CPU_ProbeSHA2()
{
#if (CRYPTOPP_ALTIVEC_AVAILABLE)
# if defined(CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY)
|