From 905225a36ca219dad9e99a7d9160748e9103402e Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 29 Jan 2014 16:59:46 -0500 Subject: [PATCH] revert previous change that does not correct the issue. opened a bug with apple on this issue https://bugreport.apple.com/problem/viewproblem #15938497 --- libs/srtp/crypto/include/crypto_math.h | 4 ---- libs/srtp/crypto/include/datatypes.h | 1 + libs/srtp/crypto/kernel/crypto_kernel.c | 3 --- libs/srtp/crypto/kernel/err.c | 3 --- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/libs/srtp/crypto/include/crypto_math.h b/libs/srtp/crypto/include/crypto_math.h index e91c61992f..be6558f638 100644 --- a/libs/srtp/crypto/include/crypto_math.h +++ b/libs/srtp/crypto/include/crypto_math.h @@ -46,10 +46,6 @@ #define MATH_H #include "datatypes.h" -#ifndef SRTP_KERNEL -# include -#endif - unsigned char v32_weight(v32_t a); diff --git a/libs/srtp/crypto/include/datatypes.h b/libs/srtp/crypto/include/datatypes.h index 841cca8b93..17b531beb6 100644 --- a/libs/srtp/crypto/include/datatypes.h +++ b/libs/srtp/crypto/include/datatypes.h @@ -53,6 +53,7 @@ #include #ifndef SRTP_KERNEL +# include # include # include # ifdef HAVE_NETINET_IN_H diff --git a/libs/srtp/crypto/kernel/crypto_kernel.c b/libs/srtp/crypto/kernel/crypto_kernel.c index a0a75df0bc..23131c9c54 100644 --- a/libs/srtp/crypto/kernel/crypto_kernel.c +++ b/libs/srtp/crypto/kernel/crypto_kernel.c @@ -46,9 +46,6 @@ #include "alloc.h" #include "crypto_kernel.h" -#ifndef SRTP_KERNEL -# include -#endif /* the debug module for the crypto_kernel */ diff --git a/libs/srtp/crypto/kernel/err.c b/libs/srtp/crypto/kernel/err.c index b9dbb5c2fd..f68a629975 100644 --- a/libs/srtp/crypto/kernel/err.c +++ b/libs/srtp/crypto/kernel/err.c @@ -47,9 +47,6 @@ #endif #include "err.h" -#ifndef SRTP_KERNEL -# include -#endif #ifdef ERR_REPORTING_SYSLOG # ifdef HAVE_SYSLOG_H -- 2.47.2