summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-08-31 18:34:16 -0700
committerunknown <jimw@mysql.com>2005-08-31 18:34:16 -0700
commit1b6fdf86f93c63b10841d16da5fd403302c259da (patch)
tree80e1955f8266db9ec4aff1ea0e0b35fbf3d036ab /include
parent53effe94aa0efe28c503220ea26cd42a7b4294e0 (diff)
parentb34af8cde47ec0168b5878988b791cbc69dc65b4 (diff)
downloadmariadb-git-1b6fdf86f93c63b10841d16da5fd403302c259da.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-7156
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h
index be6e667057d..f3d42106458 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -310,6 +310,10 @@ C_MODE_END
#undef setrlimit
#define setrlimit cma_setrlimit64
#endif
+/* Declare madvise where it is not declared for C++, like Solaris */
+#if HAVE_MADVISE && !HAVE_DECL_MADVISE && defined(__cplusplus)
+extern "C" int madvise(void *addr, size_t len, int behav);
+#endif
#ifdef __QNXNTO__
/* This has to be after include limits.h */