From a07decf1d910a9664a7f8002c3d53a34b95761f6 Mon Sep 17 00:00:00 2001 From: Damien Stuart Date: Wed, 9 Sep 2009 01:38:03 +0000 Subject: [PATCH] Added some more stuff to deal with byte order identification on Solaris 10 x86 systems. git-svn-id: file:///home/mbr/svn/fwknop/trunk@142 510a4753-2344-4c79-9c09-4d669213fbeb --- lib/sha2.c | 14 ++++++++++++-- lib/sha2.h | 4 ++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/sha2.c b/lib/sha2.c index eda9f1a3..81cee1c0 100644 --- a/lib/sha2.c +++ b/lib/sha2.c @@ -36,6 +36,10 @@ #include /* assert() */ #include "sha2.h" +#if HAVE_SYS_BYTEORDER_H + #include +#endif + /* * ASSERT NOTE: * Some sanity checking code is included using assert(). On my FreeBSD @@ -86,8 +90,14 @@ * made). */ -#ifdef WIN32 - #define BYTE_ORDER BIG_ENDIAN +#ifndef BYTE_ORDER + #ifdef WIN32 + #define BYTE_ORDER BIG_ENDIAN + #elif defined(_BIG_ENDIAN) + #define BYTE_ORDER BIG_ENDIAN + #elif defined(_LITTLE_ENDIAN) + #define BYTE_ORDER LITTLE_ENDIAN + #endif #endif #if !defined(BYTE_ORDER) || (BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN) diff --git a/lib/sha2.h b/lib/sha2.h index 190b697d..8b6e6f40 100644 --- a/lib/sha2.h +++ b/lib/sha2.h @@ -48,6 +48,10 @@ extern "C" { */ #include +#if HAVE_INTTYPES_H + #define SHA2_USE_INTTYPES_H +#endif + #ifdef SHA2_USE_INTTYPES_H #include #endif /* SHA2_USE_INTTYPES_H */