commit 7ee5ddd798201d6bcafe6acb10bf4f14e6e7ddfe
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jun 03 10:33:55 2015 +0100
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jun 03 10:33:55 2015 +0100
tree 94fbd39e9081ba13398cf39bf4f7e9f6f55458e8
parent 718593681e980b4032c1490f7c8fb049452645a0
parent dccb80b7e55281fb0fba1c88c69baddc5d72e0ea

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Fix compile errors with NO_STD_FUNCTIONS
  Expand config.pl's notion of "full"
  Ack external bugfix in Changelog
  FIx misplaced Changelog entry (oops)
  Fix compile bug: incompatible declaration of polarssl_exit in platform.c
  Fix contributor's name in Changelog

library/platform.c

diff --git a/library/platform.c b/library/platform.c
index e9ab302..123267a 100644
--- a/library/platform.c
+++ b/library/platform.c
@@ -73,7 +73,7 @@
 {
     ((void) s);
     ((void) n);
-    ((void) format)
+    ((void) format);
     return( 0 );
 }
 
@@ -149,13 +149,12 @@
 static void platform_exit_uninit( int status )
 {
     ((void) status);
-    return( 0 );
 }
 
 #define MBEDTLS_PLATFORM_STD_EXIT   platform_exit_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_EXIT */
 
-int (*mbedtls_exit)( int status ) = MBEDTLS_PLATFORM_STD_EXIT;
+void (*mbedtls_exit)( int status ) = MBEDTLS_PLATFORM_STD_EXIT;
 
 int mbedtls_platform_set_exit( void (*exit_func)( int status ) )
 {