argpar: sync with upstream - adjust to iterator API

[lttng-tools.git] / src / common / error.h

diff --git a/src/common/error.h b/src/common/error.h
index 8bb0de15cfa70f0c621bae207932274903a65c70..bcbb51b16c1a1910229bd2820070e92ed108db28 100644 (file)
--- a/src/common/error.h
+++ b/src/common/error.h
@@ -25,10 +25,6 @@
 #include <lttng/lttng-error.h>
 #include <common/compat/tid.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
 /* Avoid conflict with Solaris <sys/regset.h> */
 #if defined(ERR) && defined(__sun__)
 #undef ERR
@@ -112,7 +108,7 @@ static inline bool __lttng_print_check_opt(enum lttng_error_level type)
        return true;
 }
 
-void lttng_abort_on_error(void);
+C_LINKAGE void lttng_abort_on_error(void);
 
 static inline void __lttng_print_check_abort(enum lttng_error_level type)
 {
@@ -268,8 +264,4 @@ const char *log_add_time(void);
 /* Name must be a statically-allocated string. */
 void logger_set_thread_name(const char *name, bool set_pthread_name);
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif /* _ERROR_H */