diff options
| author | serg@serg.mylan <> | 2005-03-15 18:33:43 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-03-15 18:33:43 +0100 |
| commit | caa29b4776bd179c1b326cbd9dd39a82aa27eb16 (patch) | |
| tree | 522fc7fd2be6c65f09f61592ebd9e93031f5e930 /include | |
| parent | 3f6fdabe4f5f8d5b2ce91e8842809a8e45e1ba87 (diff) | |
| parent | 10c06f257a11429e790c4b2e101814b3af4d1040 (diff) | |
| download | mariadb-git-caa29b4776bd179c1b326cbd9dd39a82aa27eb16.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 15 | ||||
| -rw-r--r-- | include/my_sys.h | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h index e9470ac48aa..e78ec21523d 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -120,6 +120,21 @@ #define __STDC_EXT__ 1 /* To get large file support on hpux */ #endif +/* + Solaris include file <sys/feature_tests.h> refers to X/Open document + + System Interfaces and Headers, Issue 5 + + saying we should define _XOPEN_SOURCE=500 to get POSIX.1c prototypes + but apparently other systems (namely FreeBSD) don't agree. + Furthermore X/Open has since 2004 "System Interfaces, Issue 6" + that dictates _XOPEN_SOURCE=600, but Solaris checks for 500. + So, let's define 500 for solaris only. +*/ +#ifdef __sun__ +#define _XOPEN_SOURCE 500 +#endif + #if defined(THREAD) && !defined(__WIN__) && !defined(OS2) #ifndef _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS /* We want posix threads */ diff --git a/include/my_sys.h b/include/my_sys.h index ce785b58da4..afd2803b75d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -812,7 +812,7 @@ my_bool my_gethwaddr(uchar *to); /* qnx ? */ #define my_getpagesize() 8192 #endif -#define my_munmap(a,b) munmap((char*)(a),(b)) +#define my_munmap(a,b) munmap((a),(b)) #else /* not a complete set of mmap() flags, but only those that nesessary */ |