summaryrefslogtreecommitdiff
path: root/crypto/camellia
diff options
context:
space:
mode:
authorsteve <steve>2008-11-12 17:02:40 +0000
committersteve <steve>2008-11-12 17:02:40 +0000
commitc87e64dfd40e1fe083a84c664bcde1903af016a4 (patch)
treef2e5a331271e274e2018af22a7a222bbe4f2f621 /crypto/camellia
parent5f862d2972316a9e360fa00191b8e59ea4f4bfa3 (diff)
downloadopenssl-c87e64dfd40e1fe083a84c664bcde1903af016a4.tar.gz
Reinstate camellia header fix patch.
Diffstat (limited to 'crypto/camellia')
-rw-r--r--crypto/camellia/cmll_locl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/camellia/cmll_locl.h b/crypto/camellia/cmll_locl.h
index 6892a6232..f7af06978 100644
--- a/crypto/camellia/cmll_locl.h
+++ b/crypto/camellia/cmll_locl.h
@@ -79,7 +79,7 @@ typedef unsigned char u8;
# endif
# define GETU32(p) SWAP(*((u32 *)(p)))
# define PUTU32(p,v) (*((u32 *)(p)) = SWAP((v)))
-#elif defined(__GNUC__) && __GNUC__>=2 && (defined(__i386) || defined(__x86_64))
+#elif defined(__GNUC__) && __GNUC__>=2 && (defined(__i386) || defined(__x86_64)) && !defined(PEDANTIC)
# if defined(B_ENDIAN) /* stratus.com does it */
# define GETU32(p) (*(u32 *)(p))
# define PUTU32(p,v) (*(u32 *)(p)=(v))