diff options
| author | pgalbraith@bk-internal.mysql.com <> | 2006-12-09 02:34:42 +0100 |
|---|---|---|
| committer | pgalbraith@bk-internal.mysql.com <> | 2006-12-09 02:34:42 +0100 |
| commit | 23f0c6d7658de7a5c465d7afb66ae2f87d8ea96a (patch) | |
| tree | a683748b700b98b6f378009228727821e369623b /include | |
| parent | 37f7e29db2ff83e2e4407d49f3d00d6575206f2e (diff) | |
| parent | c24381bdaaca307148888f2cf7c223570266c4f0 (diff) | |
| download | mariadb-git-23f0c6d7658de7a5c465d7afb66ae2f87d8ea96a.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
Diffstat (limited to 'include')
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rw-r--r-- | include/my_sys.h | 19 |
2 files changed, 8 insertions, 12 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 814badc24be..8651a2dd9b1 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -70,6 +70,7 @@ abi_check: $(HEADERS_ABI) mysql_version.h mysql_h.ic if [ @ICHECK@ != no ] ; then \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ @ICHECK@ --compare mysql_h.ic $@.ic; \ + $(RM) -f $@.ic; \ fi; \ touch abi_check; diff --git a/include/my_sys.h b/include/my_sys.h index d185913cda1..7faffd6a18f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -857,12 +857,6 @@ extern int my_getncpus(); #else #define my_mmap(a,b,c,d,e,f) mmap(a,b,c,d,e,f) #endif -#ifdef HAVE_GETPAGESIZE -#define my_getpagesize() getpagesize() -#else -/* qnx ? */ -#define my_getpagesize() 8192 -#endif #define my_munmap(a,b) munmap((a),(b)) #else @@ -880,16 +874,17 @@ extern int my_getncpus(); #define HAVE_MMAP #endif -#ifndef __NETWARE__ -int my_getpagesize(void); -#else -#define my_getpagesize() 8192 -#endif - void *my_mmap(void *, size_t, int, int, int, my_off_t); int my_munmap(void *, size_t); #endif +/* my_getpagesize */ +#ifdef HAVE_GETPAGESIZE +#define my_getpagesize() getpagesize() +#else +int my_getpagesize(void); +#endif + int my_msync(int, void *, size_t, int); /* character sets */ |