diff options
| author | reggie@mdk10.(none) <> | 2005-02-23 16:29:03 -0600 |
|---|---|---|
| committer | reggie@mdk10.(none) <> | 2005-02-23 16:29:03 -0600 |
| commit | 2ffd3a3a61333d9c18c923bf827cf11dae39dc11 (patch) | |
| tree | ab1e727b792d995de827c133c1300251cd725c03 /myisam | |
| parent | 55420a8d013d5159e405e32c331c1e730f75ac59 (diff) | |
| download | mariadb-git-2ffd3a3a61333d9c18c923bf827cf11dae39dc11.tar.gz | |
Changes to allow 5.0.3 to compile on Windows after XA was pushed
logging_ok:
Logging to logging@openlogging.org accepted
mi_packrec.c:
Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap
mi_extra.c:
Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h
my_mmap.c:
Changed how no mmap message is printed for Windows
sql_map.cc:
Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_extra.c | 2 | ||||
| -rw-r--r-- | myisam/mi_packrec.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c index 9023fe26f9e..ba32bb9115a 100644 --- a/myisam/mi_extra.c +++ b/myisam/mi_extra.c @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "myisamdef.h" -#ifdef HAVE_MMAP +#ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #endif diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c index a8a27858d79..f3e942943aa 100644 --- a/myisam/mi_packrec.c +++ b/myisam/mi_packrec.c @@ -1181,11 +1181,12 @@ static uint max_bit(register uint value) /***************************************************************************** Some redefined functions to handle files when we are using memmap *****************************************************************************/ +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> +#endif #ifdef HAVE_MMAP -#include <sys/mman.h> - static int _mi_read_mempack_record(MI_INFO *info,my_off_t filepos,byte *buf); static int _mi_read_rnd_mempack_record(MI_INFO*, byte *,my_off_t, my_bool); @@ -1211,7 +1212,7 @@ my_bool _mi_memmap_file(MI_INFO *info) DBUG_RETURN(0); } file_map=(byte*) - mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ, + my_mmap(0,share->state.state.data_file_length+MEMMAP_EXTRA_MARGIN,PROT_READ, MAP_SHARED | MAP_NORESERVE,info->dfile,0L); if (file_map == (byte*) MAP_FAILED) { @@ -1230,7 +1231,7 @@ my_bool _mi_memmap_file(MI_INFO *info) void _mi_unmap_file(MI_INFO *info) { - VOID(munmap((caddr_t) info->s->file_map, + VOID(my_munmap((caddr_t) info->s->file_map, (size_t) info->s->state.state.data_file_length+ MEMMAP_EXTRA_MARGIN)); } |