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 be6558f638109b52ebbabacf533dc2dd399688b4..e91c61992f06981e063d77969f39fcfbeb6455d8 100644 (file)
--- 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 17b531beb6a4a869e1998c745ffdb11c4fa0abf3..841cca8b937dd3b51ba6a5bbbc5e5067135a124f 100644 (file)
--- 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 23131c9c548dbc7f6db430655c8952bfac1449d5..a0a75df0bc2df4d38d3f1aaa169b6b73e9c78955 100644 (file)
--- 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 f68a629975c22211ec8a6bddc9c8ba38bc1c3f9c..b9dbb5c2fd7f70b6a602e6d3e227aa8d831362f8 100644 (file)
--- a/libs/srtp/crypto/kernel/err.c
+++ b/libs/srtp/crypto/kernel/err.c
@@ -47,6 +47,9 @@
 #endif
 
 #include "err.h"
+#ifndef SRTP_KERNEL
+# include <stdio.h>
+#endif
 
 #ifdef ERR_REPORTING_SYSLOG
 # ifdef HAVE_SYSLOG_H

diff --git a/libs/srtp/crypto/math/math.c b/libs/srtp/crypto/math/math.c
index f3aaf650141ec643ed6f0357f8a3b4b2fb8887f7..0d4757792d04c082fec9201e0a9b662e5bf4f24c 100644 (file)
--- a/libs/srtp/crypto/math/math.c
+++ b/libs/srtp/crypto/math/math.c
@@ -814,7 +814,6 @@ bitvector_get_bit(const bitvector_t *v, int bit_index) {
   
 }
 
-#include <stdio.h>
 
 int
 bitvector_print_hex(const bitvector_t *v, FILE *stream) {