summaryrefslogtreecommitdiff
path: root/include/m_string.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-30 01:22:02 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-30 01:22:02 +0300
commit9a4aac7e23446427ec705d3b65095b8a8f956aee (patch)
tree0333b688453602a24b5a46133bd78136de042d90 /include/m_string.h
parenta221315fa94310bad927a0a76ca9baf204166ccb (diff)
downloadmariadb-git-9a4aac7e23446427ec705d3b65095b8a8f956aee.tar.gz
Fix for OS2
Docs/manual.texi: Cleanup
Diffstat (limited to 'include/m_string.h')
-rw-r--r--include/m_string.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 84c42e0c8b9..7eb2f1fe690 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -82,7 +82,7 @@
# define bmove_allign(A,B,C) memcpy((A),(B),(C))
#endif
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(OS2)
extern "C" {
#endif
@@ -238,7 +238,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
#endif
#endif
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(OS2)
}
#endif
#endif