From: Michael Jerris <mike@jerris.com>
Date: Wed, 29 Jan 2014 16:39:03 +0000 (-0500)
Subject: FS-5956: fix __sputc included twice due to stdio.h inlining issue
X-Git-Tag: v1.5.8~25^2~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a014108477d575156825cecdd44a955edff10b0;p=thirdparty%2Ffreeswitch.git

FS-5956: fix __sputc included twice due to stdio.h inlining issue
---

diff --git a/libs/srtp/crypto/include/crypto_math.h b/libs/srtp/crypto/include/crypto_math.h
index 52f083721d..5ddf4d5f42 100644
--- a/libs/srtp/crypto/include/crypto_math.h
+++ b/libs/srtp/crypto/include/crypto_math.h
@@ -46,6 +46,10 @@
 #define MATH_H
 
 #include "datatypes.h"
+#ifndef SRTP_KERNEL
+# include <stdio.h>
+#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 6f18e9ebbf..055f4b7cac 100644
--- a/libs/srtp/crypto/include/datatypes.h
+++ b/libs/srtp/crypto/include/datatypes.h
@@ -53,7 +53,6 @@
 #include <stdarg.h>
 
 #ifndef SRTP_KERNEL
-# include <stdio.h>
 # include <string.h>
 # include <time.h>
 # ifdef HAVE_NETINET_IN_H
diff --git a/libs/srtp/crypto/kernel/crypto_kernel.c b/libs/srtp/crypto/kernel/crypto_kernel.c
index 90c4a3073a..4d7ff0f284 100644
--- a/libs/srtp/crypto/kernel/crypto_kernel.c
+++ b/libs/srtp/crypto/kernel/crypto_kernel.c
@@ -46,6 +46,9 @@
 #include "alloc.h"
 
 #include "crypto_kernel.h"
+#ifndef SRTP_KERNEL
+# include <stdio.h>
+#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 6b00e7b877..f16bbfda91 100644
--- a/libs/srtp/crypto/kernel/err.c
+++ b/libs/srtp/crypto/kernel/err.c
@@ -43,6 +43,9 @@
  */
 
 #include "err.h"
+#ifndef SRTP_KERNEL
+# include <stdio.h>
+#endif
 
 #ifdef ERR_REPORTING_SYSLOG
 # ifdef HAVE_SYSLOG_H