diff options
author | jimw@mysql.com <> | 2005-08-31 19:12:16 -0700 |
---|---|---|
committer | jimw@mysql.com <> | 2005-08-31 19:12:16 -0700 |
commit | d6db387aea880759b84e9c1f1b253e48e99a23b7 (patch) | |
tree | d1f472d71ff75d1aa210d6a6e3c0a0ade588ac60 /include/my_global.h | |
parent | 1d997477aa848779ea38526e18aaf824fd0ac3de (diff) | |
parent | c3f4ecb544ffb597bcf5b2aae7efccb5699fec48 (diff) | |
download | mariadb-git-d6db387aea880759b84e9c1f1b253e48e99a23b7.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'include/my_global.h')
-rw-r--r-- | include/my_global.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/my_global.h b/include/my_global.h index dcf7e648b5e..a4177f8ea7c 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -331,6 +331,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 */ |