commit 00ab47026bde24fca88362dab620c6ff835606ac
author Rich Evans <rich.evans@arm.com> Fri Feb 06 13:43:58 2015 +0000
committer Rich Evans <rich.evans@arm.com> Tue Feb 10 11:28:46 2015 +0000
tree 8e91d30f288f8178519b3d325ea4b41a7e841b68
parent e83ac1d7d1dc8503d150ba836ebadab542fd740f

cleanup library and some basic tests. Includes, add guards to includes

library/gcm.c

diff --git a/library/gcm.c b/library/gcm.c
index 415e53a..39cb189 100644
--- a/library/gcm.c
+++ b/library/gcm.c
@@ -40,15 +40,20 @@
 
 #include "polarssl/gcm.h"
 
+#include <string.h>
+
 #if defined(POLARSSL_AESNI_C)
 #include "polarssl/aesni.h"
 #endif
 
+#if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
 #if defined(POLARSSL_PLATFORM_C)
 #include "polarssl/platform.h"
 #else
+#include <stdio.h>
 #define polarssl_printf printf
-#endif
+#endif /* POLARSSL_PLATFORM_C */
+#endif /* POLARSSL_SELF_TEST && POLARSSL_AES_C */
 
 /*
  * 32-bit integer manipulation macros (big endian)
@@ -496,9 +501,6 @@
 }
 
 #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
-
-#include <stdio.h>
-
 /*
  * AES-GCM test vectors from:
  *