From 01d8d0c795f11be2ceed605b07beabe9c456c140 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Sun, 13 May 2018 19:05:39 -0700
Subject: [PATCH] Moved C++ header includes out of extern "C" and added missing
 C header includes (#1053)

---
 cscore/src/main/native/include/cscore_c.h |  4 ++++
 ntcore/src/main/native/include/ntcore_c.h | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cscore/src/main/native/include/cscore_c.h b/cscore/src/main/native/include/cscore_c.h
index da3043ce94..8258ee78d9 100644
--- a/cscore/src/main/native/include/cscore_c.h
+++ b/cscore/src/main/native/include/cscore_c.h
@@ -10,7 +10,11 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
 #include <cstddef>
+#else
+#include <stddef.h>
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/ntcore/src/main/native/include/ntcore_c.h b/ntcore/src/main/native/include/ntcore_c.h
index c30296fb48..969a2760b3 100644
--- a/ntcore/src/main/native/include/ntcore_c.h
+++ b/ntcore/src/main/native/include/ntcore_c.h
@@ -10,18 +10,18 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+#include <cstddef>
+#else
+#include <stddef.h>
+#endif
+
 #include <wpi/deprecated.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifdef __cplusplus
-#include <cstddef>
-#else
-#include <cstddef>
-#endif
-
 /** Typedefs */
 typedef int NT_Bool;