From 5064f263546c5928b142e3f36c6b24f63c0f4da2 Mon Sep 17 00:00:00 2001
From: unknown <reggie@mdk10.(none)>
Date: Wed, 23 Feb 2005 22:55:46 -0600
Subject: More changes to make 5.0.3 compile on Windows

sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
mi_packrec.c:
  removed cast to caddr_t


myisam/mi_packrec.c:
  removed cast to caddr_t
sql/my_decimal.h:
  Added define for EMBEDDED_SERVER for call to string2my_decimal
sql/sql_map.cc:
  moved include of sys/stat outside of HAVE_SYS_MMAN_H define
---
 sql/sql_map.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sql/sql_map.cc')

diff --git a/sql/sql_map.cc b/sql/sql_map.cc
index 1b874a4fd88..e557840957e 100644
--- a/sql/sql_map.cc
+++ b/sql/sql_map.cc
@@ -19,10 +19,11 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
+#include <sys/stat.h>
+
 #include "mysql_priv.h"
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
-#include <sys/stat.h>
 #endif
 
 #ifndef MAP_NORESERVE
@@ -71,7 +72,7 @@ mapped_files::~mapped_files()
 #ifdef HAVE_MMAP
   if (file >= 0)
   {
-    VOID(my_munmap((caddr_t) map,size));
+    VOID(my_munmap(map,size));
     VOID(my_close(file,MYF(0)));
     file= -1; map=0;
   }
-- 
cgit v1.2.1