From 38fe0a99d3fd36a659fe7999b1f784b9cd8a4a7a Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Fri, 28 Feb 2014 18:17:25 +0000 Subject: [PATCH] Prevent sha1_init et al from being undefined sha1_init, sha1_update, and sha1_final were ending up as undefined symbols in libfreeswitch.so because of the inline declaration, which caused us to blow up while linking the freeswitch executable. Declare these as static inline instead. --- libs/srtp/crypto/include/sha1.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/srtp/crypto/include/sha1.h b/libs/srtp/crypto/include/sha1.h index 8b02f76811..3708fd9cdb 100644 --- a/libs/srtp/crypto/include/sha1.h +++ b/libs/srtp/crypto/include/sha1.h @@ -67,18 +67,18 @@ typedef EVP_MD_CTX sha1_ctx_t; * */ -void inline sha1_init (sha1_ctx_t *ctx) +static inline void sha1_init (sha1_ctx_t *ctx) { EVP_MD_CTX_init(ctx); EVP_DigestInit(ctx, EVP_sha1()); } -void inline sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) +static inline void sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) { EVP_DigestUpdate(ctx, M, octets_in_msg); } -void inline sha1_final (sha1_ctx_t *ctx, uint32_t *output) +static inline void sha1_final (sha1_ctx_t *ctx, uint32_t *output) { unsigned int len = 0;