Merge pull request #3622 from mjstapp/fix_cpp_compile

libs, daemons: changes to permit c++ compilation

1 files changed, 12 insertions, 4 deletions

diff --git a/lib/thread.h b/lib/thread.h
index f404d92755..ec774a6543 100644
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -27,6 +27,10 @@
 #include "monotime.h"
 #include "frratomic.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct rusage_t {
 	struct rusage cpu;
 	struct timeval real;
@@ -119,13 +123,13 @@ struct thread {
 
 struct cpu_thread_history {
 	int (*func)(struct thread *);
-	_Atomic unsigned int total_calls;
-	_Atomic unsigned int total_active;
+	atomic_uint_fast32_t total_calls;
+	atomic_uint_fast32_t total_active;
 	struct time_stats {
-		_Atomic unsigned long total, max;
+		atomic_size_t total, max;
 	} real;
 	struct time_stats cpu;
-	_Atomic uint32_t types;
+	atomic_uint_fast32_t types;
 	const char *funcname;
 };
 
@@ -233,4 +237,8 @@ extern unsigned long thread_consumed_time(RUSAGE_T *after, RUSAGE_T *before,
 /* only for use in logging functions! */
 extern pthread_key_t thread_current;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _ZEBRA_THREAD_H */