From f42905b32eac1a808003455f593613a0dd0a42e6 Mon Sep 17 00:00:00 2001
From: David Vo <auscompgeek@users.noreply.github.com>
Date: Sun, 28 Apr 2019 14:52:54 +1000
Subject: [PATCH] Include missing headers in HAL.h (#1660)

* Include CANAPI.h and Encoder.h in HAL.h

* Include Threads.h in HAL.h

* Make Threads.h C compatible

Also changes the #define to a typedef.
---
 hal/src/main/native/include/hal/HAL.h     |  3 +++
 hal/src/main/native/include/hal/Threads.h | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hal/src/main/native/include/hal/HAL.h b/hal/src/main/native/include/hal/HAL.h
index f0da13f4d0..da5dfa9dcd 100644
--- a/hal/src/main/native/include/hal/HAL.h
+++ b/hal/src/main/native/include/hal/HAL.h
@@ -18,11 +18,13 @@
 #include "hal/AnalogOutput.h"
 #include "hal/AnalogTrigger.h"
 #include "hal/CAN.h"
+#include "hal/CANAPI.h"
 #include "hal/Compressor.h"
 #include "hal/Constants.h"
 #include "hal/Counter.h"
 #include "hal/DIO.h"
 #include "hal/DriverStation.h"
+#include "hal/Encoder.h"
 #include "hal/Errors.h"
 #include "hal/I2C.h"
 #include "hal/Interrupts.h"
@@ -35,6 +37,7 @@
 #include "hal/SPI.h"
 #include "hal/SerialPort.h"
 #include "hal/Solenoid.h"
+#include "hal/Threads.h"
 
 #endif  // HAL_USE_LABVIEW
 
diff --git a/hal/src/main/native/include/hal/Threads.h b/hal/src/main/native/include/hal/Threads.h
index 4908c9c44a..1b3d35d380 100644
--- a/hal/src/main/native/include/hal/Threads.h
+++ b/hal/src/main/native/include/hal/Threads.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#define NativeThreadHandle const void*
-
 #include "hal/Types.h"
 
 /**
@@ -17,7 +15,12 @@
  * @{
  */
 
+typedef const void* NativeThreadHandle;
+
+#ifdef __cplusplus
 extern "C" {
+#endif
+
 /**
  * Gets the thread priority for the specified thread.
  *
@@ -68,5 +71,8 @@ HAL_Bool HAL_SetThreadPriority(NativeThreadHandle handle, HAL_Bool realTime,
  */
 HAL_Bool HAL_SetCurrentThreadPriority(HAL_Bool realTime, int32_t priority,
                                       int32_t* status);
+
+#ifdef __cplusplus
 }  // extern "C"
+#endif
 /** @} */