bzr commit into mysql-6.0-wtf branch (vvaintroub:2659)

[Vladislav Vaintroub]

#At file:///C:/bzr/mysql-6.0-wtf-interlock/

 2659 Vladislav Vaintroub	2008-06-20
      (no message)
modified:
  include/my_dir.h
  mysys/my_winfile.c

per-file messages:
  include/my_dir.h
    Fix build on 32 bit Windows, my_win_fstat functions (fstati64 accepts struct _stati64
*, not __stat64 *).
    Fix some warnings
  mysys/my_winfile.c
    Fix 32 bit Windows build with Visual Studio 2003.
    fstati64() expects struct _stati64 * as parameter, not __stat64
=== modified file 'include/my_dir.h'
--- a/include/my_dir.h	2008-06-17 23:37:23 +0000
+++ b/include/my_dir.h	2008-06-19 23:53:16 +0000
@@ -70,7 +70,8 @@ typedef struct my_stat
 #else
 
 #if(_MSC_VER)
-#define MY_STAT struct __stat64 /* 64 bit file size and timestamp */
+#include <sys/types.h>
+#define MY_STAT struct _stati64 /* 64 bit file size */
 #else
 #define MY_STAT struct stat	/* Orginal struct have what we need */
 #endif

=== modified file 'mysys/my_winfile.c'
--- a/mysys/my_winfile.c	2008-06-17 23:37:23 +0000
+++ b/mysys/my_winfile.c	2008-06-19 23:53:16 +0000
@@ -585,7 +585,7 @@ int my_win_fclose(FILE *file)
   Patch file size, because size that fstat returns is not 
   reliable (may be outdated)
 */
-int my_win_fstat(File fd, struct _stat64 *buf)
+int my_win_fstat(File fd, struct _stati64 *buf)
 {
   int crt_fd;
   int retval;
@@ -615,7 +615,7 @@ int my_win_fstat(File fd, struct _stat64
 
 
 
-int my_win_stat( const char *path, struct _stat64 *buf)
+int my_win_stat( const char *path, struct _stati64 *buf)
 {
   DBUG_ENTER("my_win_stat");
   if(_stati64( path, buf) == 0)