diff options
| author | unknown <mskold@mysql.com> | 2005-02-23 15:54:22 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-23 15:54:22 +0100 |
| commit | 5a442d6af601492ef26c3dcab03ef46e553ac540 (patch) | |
| tree | 5c4c73b1e94ee56066c2db7e9cca505a609afabd /include | |
| parent | 9968b41dbfe260fc6890956c233fdf4e5888361a (diff) | |
| parent | 26c93519a9ab646142ea2eb912ea5c6b45cca057 (diff) | |
| download | mariadb-git-5a442d6af601492ef26c3dcab03ef46e553ac540.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 498a1bd30fe..4618c25dbfb 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -804,8 +804,13 @@ my_bool my_gethwaddr(uchar *to); #endif #define my_mmap(a,b,c,d,e,f) mmap(a,b,c,d,e,f) +#ifdef HAVE_GETPAGESIZE #define my_getpagesize() getpagesize() -#define my_munmap(a,b) munmap(a,b) +#else +/* qnx ? */ +#define my_getpagesize() 8192 +#endif +#define my_munmap(a,b) munmap((char*)(a),(b)) #else /* not a complete set of mmap() flags, but only those that nesessary */ |