diff options
author | unknown <serg@serg.mylan> | 2005-03-02 10:41:23 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-03-02 10:41:23 +0100 |
commit | f508a6ca80c72f96008a1e9a977f9563637c1a89 (patch) | |
tree | d07afa7838a55f37fd85a9d3a6923a303e250d62 /mysys/my_mmap.c | |
parent | e1ba1632fbb444adea39054f6cc1e58e9d1c3ee0 (diff) | |
parent | c4409a7cbf9b43ed450340ba9dd6a33f821df5f2 (diff) | |
download | mariadb-git-f508a6ca80c72f96008a1e9a977f9563637c1a89.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
sql/ha_innodb.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'mysys/my_mmap.c')
-rw-r--r-- | mysys/my_mmap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c index ed662a38712..98243c9d5d8 100644 --- a/mysys/my_mmap.c +++ b/mysys/my_mmap.c @@ -85,9 +85,7 @@ int my_msync(int fd, void *addr, size_t len, int flags) #endif -#ifdef _WINDOWS -#pragma message "no mmap!" -#else +#ifndef __WIN__ #warning "no mmap!" #endif |