aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-11-12 17:02:40 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-11-12 17:02:40 +0000
commit5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9 (patch)
tree3a2ffc06ce348d83e387d5805c058f80ddfb3e4e /crypto
parentdab629348222ad62f27bc5ba0fc36bfcf0ba4604 (diff)
downloadopenssl-5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9.zip
openssl-5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9.tar.gz
openssl-5aca224ecd7fcbcb39b3e302106708cd2f6f0fb9.tar.bz2
Reinstate camellia header fix patch.
Diffstat (limited to 'crypto')
-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 6892a62..f7af069 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))