projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bin: compile lttng as C++
[lttng-tools.git]
/
src
/
common
/
error.h
diff --git
a/src/common/error.h
b/src/common/error.h
index b43ec661b76a5ee742495c438b0232007768491f..6660cee6adec9f765d8802bacfe80db44e67f954 100644
(file)
--- a/
src/common/error.h
+++ b/
src/common/error.h
@@
-25,6
+25,10
@@
#include <lttng/lttng-error.h>
#include <common/compat/tid.h>
#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
/* Avoid conflict with Solaris <sys/regset.h> */
#if defined(ERR) && defined(__sun__)
#undef ERR
@@
-44,7
+48,7
@@
struct log_time {
char str[19];
};
extern DECLARE_URCU_TLS(struct log_time, error_log_time);
char str[19];
};
extern DECLARE_URCU_TLS(struct log_time, error_log_time);
-extern
LTTNG_HIDDEN
DECLARE_URCU_TLS(const char *, logger_thread_name);
+extern DECLARE_URCU_TLS(const char *, logger_thread_name);
extern int lttng_opt_quiet;
extern int lttng_opt_verbose;
extern int lttng_opt_quiet;
extern int lttng_opt_verbose;
@@
-221,7
+225,7
@@
static inline void __lttng_print_check_abort(enum lttng_error_level type)
DBG3(fmt, ## args); \
break; \
default: \
DBG3(fmt, ## args); \
break; \
default: \
- a
ssert(0);
\
+ a
bort();
\
} \
} while(0);
} \
} while(0);
@@
-262,7
+266,10
@@
const char *error_get_str(int32_t code);
const char *log_add_time(void);
/* Name must be a statically-allocated string. */
const char *log_add_time(void);
/* Name must be a statically-allocated string. */
-LTTNG_HIDDEN
void logger_set_thread_name(const char *name, bool set_pthread_name);
void logger_set_thread_name(const char *name, bool set_pthread_name);
+#if defined(__cplusplus)
+}
+#endif
+
#endif /* _ERROR_H */
#endif /* _ERROR_H */
This page took
0.026666 seconds
and
4
git commands to generate.