From f8ed5a9bd9fa8384430973465e94aa14c925872d Mon Sep 17 00:00:00 2001
From: Eyal Rozenberg <eyalroz1@gmx.com>
Date: Fri, 14 Oct 2022 16:09:08 +0300
Subject: [PATCH] Fixes #144, fixes #145: Rearranged system header inclusion in
 `printf.c` and removes its excessive use of extern "C".

---
 src/printf/printf.c | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/printf/printf.c b/src/printf/printf.c
index 0f2592f..8d65787 100644
--- a/src/printf/printf.c
+++ b/src/printf/printf.c
@@ -37,27 +37,23 @@
  * THE SOFTWARE.
  */
 
-#ifdef __cplusplus
-#include <cstdint>
-#include <climits>
-extern "C" {
-#else
-#include <stdbool.h>
-#include <stdint.h>
-#include <limits.h>
-#endif // __cplusplus
-
 // Define this globally (e.g. gcc -DPRINTF_INCLUDE_CONFIG_H=1 ...) to include the
 // printf_config.h header file
 #if PRINTF_INCLUDE_CONFIG_H
 #include "printf_config.h"
 #endif
 
-#include <stdbool.h>
-#include <stdint.h>
-
 #include <printf/printf.h>
 
+#ifdef __cplusplus
+#include <cstdint>
+#include <climits>
+#else
+#include <stdint.h>
+#include <limits.h>
+#include <stdbool.h>
+#endif // __cplusplus
+
 #if PRINTF_ALIAS_STANDARD_FUNCTION_NAMES
 # define printf_    printf
 # define sprintf_   sprintf
@@ -1427,7 +1423,3 @@ int fctprintf(void (*out)(char c, void* extra_arg), void* extra_arg, const char*
   return ret;
 }
 
-
-#ifdef __cplusplus
-} // extern "C"
-#endif