From 0c98a318dd725b43d1cc2a061e8231de97b4660a Mon Sep 17 00:00:00 2001 From: counterpoint Date: Mon, 22 Jun 2015 12:13:28 +0100 Subject: [PATCH] Try to get atomic.h included correctly for C++ --- .gitignore | 3 ++- log_manager/log_manager.cc | 1 + server/include/atomic.h | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7fe302bd3..4fb4e729a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ depend.mk # Vi swap files .*.swp -/build/ \ No newline at end of file +/build/ +*.reviewboardrc diff --git a/log_manager/log_manager.cc b/log_manager/log_manager.cc index b31ae6112..5eda099ad 100644 --- a/log_manager/log_manager.cc +++ b/log_manager/log_manager.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/server/include/atomic.h b/server/include/atomic.h index f139d15d5..f89506e6f 100644 --- a/server/include/atomic.h +++ b/server/include/atomic.h @@ -30,5 +30,9 @@ * @endverbatim */ +#ifdef __cplusplus +extern "C" int atomic_add(int *variable, int value); +#else extern int atomic_add(int *variable, int value); #endif +#endif