[sr-dev] git:master:44b20f67: Merge pull request #70 from jda/master

Module: kamailio Branch: master Commit: 44b20f67e925ae2ba30f8bb16402dd2f5ec48b66 URL: https://github.com/kamailio/kamailio/commit/44b20f67e925ae2ba30f8bb16402dd2… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2015-02-09T22:51:30+01:00 Merge pull request #70 from jda/master fix compile errors in srutils/sha256 on SunOS (SmartOS) --- Modified: lib/srutils/sha256.c Modified: lib/srutils/sha256.h --- Diff: https://github.com/kamailio/kamailio/commit/44b20f67e925ae2ba30f8bb16402dd2… Patch: https://github.com/kamailio/kamailio/commit/44b20f67e925ae2ba30f8bb16402dd2… --- diff --git a/lib/srutils/sha256.c b/lib/srutils/sha256.c index 087736d..5e87beb 100644 --- a/lib/srutils/sha256.c +++ b/lib/srutils/sha256.c @@ -36,6 +36,12 @@ #include <assert.h> /* assert() */ #include "sha256.h" +/* discover byte order on solaris */ +#if defined(__SVR4) || defined(__sun) + #include <sys/isa_defs.h> + #define BYTE_ORDER _BYTE_ORDER +#endif + /* * ASSERT NOTE: * Some sanity checking code is included using assert(). On my FreeBSD diff --git a/lib/srutils/sha256.h b/lib/srutils/sha256.h index 78393e5..4c134d2 100644 --- a/lib/srutils/sha256.h +++ b/lib/srutils/sha256.h @@ -53,6 +53,12 @@ extern "C" { #endif /* SHA2_USE_INTTYPES_H */ +/* fix types for Sun Solaris */ +#if defined(__SVR4) || defined(__sun) + typedef uint8_t u_int8_t; + typedef uint32_t u_int32_t; + typedef uint64_t u_int64_t; +#endif /*** SHA-256/384/512 Various Length Definitions ***********************/ #define SHA256_BLOCK_LENGTH 64