summaryrefslogtreecommitdiff
path: root/include/my_pthread.h
diff options
context:
space:
mode:
authortim@white.box <>2001-08-21 19:24:35 -0400
committertim@white.box <>2001-08-21 19:24:35 -0400
commitf811aa44b1c9bbced5613820fce2470ffbbfbbe8 (patch)
treef63e37772831e7183bdf7008ecb9e7c0ef3081e6 /include/my_pthread.h
parentafd8a6db485706138e3854fe332bd38a8c72d1d3 (diff)
parentc8e078263fb86ed55b879ae7b4d23abf8481576b (diff)
downloadmariadb-git-f811aa44b1c9bbced5613820fce2470ffbbfbbe8.tar.gz
Merge
Diffstat (limited to 'include/my_pthread.h')
-rw-r--r--include/my_pthread.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h
index d31d09896dc..098ec9c40a5 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.h
@@ -20,6 +20,10 @@
#ifndef _my_pthread_h
#define _my_pthread_h
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#include <errno.h>
#ifndef ETIME
#define ETIME ETIMEDOUT /* For FreeBSD */
@@ -612,4 +616,9 @@ extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const));
#endif /* SAFE_STATISTICS */
#endif /* HAVE_ATOMIC_ADD */
#endif /* thread_safe_increment */
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _my_ptread_h */