From 981732bb8ef71244957d735f05b40710a740a050 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Tue, 17 Feb 2015 15:46:45 +0000
Subject: [PATCH] Fix missing/misplaced #include's

---
 library/dhm.c        | 1 +
 library/ecp.c        | 1 +
 library/x509_crl.c   | 1 +
 library/x509_csr.c   | 1 +
 tests/scripts/all.sh | 4 +++-
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/dhm.c b/library/dhm.c
index a7b275fef..60e955ad9 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -49,6 +49,7 @@
 #include "polarssl/platform.h"
 #else
 #include <stdlib.h>
+#include <stdio.h>
 #define polarssl_printf     printf
 #define polarssl_malloc     malloc
 #define polarssl_free       free
diff --git a/library/ecp.c b/library/ecp.c
index 298c9643e..26ce96239 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -57,6 +57,7 @@
 #include "polarssl/platform.h"
 #else
 #include <stdlib.h>
+#include <stdio.h>
 #define polarssl_printf     printf
 #define polarssl_malloc     malloc
 #define polarssl_free       free
diff --git a/library/x509_crl.c b/library/x509_crl.c
index 78b925caa..94076e791 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -51,6 +51,7 @@
 #include "polarssl/platform.h"
 #else
 #include <stdlib.h>
+#include <stdio.h>
 #define polarssl_free       free
 #define polarssl_malloc     malloc
 #define polarssl_snprintf   snprintf
diff --git a/library/x509_csr.c b/library/x509_csr.c
index ad49abc97..826eafd94 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -51,6 +51,7 @@
 #include "polarssl/platform.h"
 #else
 #include <stdlib.h>
+#include <stdio.h>
 #define polarssl_free       free
 #define polarssl_malloc     malloc
 #define polarssl_snprintf   snprintf
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 62d027448..83e3caf87 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -134,7 +134,8 @@ cleanup
 CC=gcc CFLAGS=-Werror make
 
 # this is meant to cath missing #define polarssl_printf etc
-msg "build: full config except platform.c" # ~ 30s
+# disable fsio to catch some more missing #include <stdio.h>
+msg "build: full config except platform/fsio" # ~ 30s
 cleanup
 cp "$CONFIG_H" "$CONFIG_BAK"
 scripts/config.pl full
@@ -142,6 +143,7 @@ scripts/config.pl unset POLARSSL_PLATFORM_C
 scripts/config.pl unset POLARSSL_PLATFORM_MEMORY
 scripts/config.pl unset POLARSSL_MEMORY_C
 scripts/config.pl unset POLARSSL_MEMORY_BUFFER_ALLOC_C
+scripts/config.pl unset POLARSSL_FS_IO
 CC=gcc CFLAGS=-Werror make
 
 if uname -a | grep -F x86_64 >/dev/null; then