Add MSVCRT prefix to _stat and _fstat (based on a patch by Rafael

dlls/crtdll/crtdll_main.c

@@ -53,7 +53,7 @@ struct crtdll_stat
   short          st_uid;
   short          st_gid;
   crtdll_dev_t   st_rdev;
-  _off_t         st_size;
+  MSVCRT(_off_t) st_size;
   MSVCRT(time_t) st_atime;
   MSVCRT(time_t) st_mtime;
   MSVCRT(time_t) st_ctime;
@@ -114,6 +114,7 @@ void __GetMainArgs( int *argc, char ***argv, char ***envp, int expand_wildcards
  */
 int CRTDLL__fstat(int fd, struct crtdll_stat* buf)
 {
+    extern int _fstat(int,struct _stat*);
     struct _stat st;
     int ret;
 
@@ -127,6 +128,7 @@ int CRTDLL__fstat(int fd, struct crtdll_stat* buf)
  */
 int CRTDLL__stat(const char* path, struct crtdll_stat * buf)
 {
+    extern int _stat(const char*,struct _stat*);
     struct _stat st;
     int ret;
 

dlls/msvcrt/file.c

@@ -670,7 +670,7 @@ int _flushall(void)
 /*********************************************************************
  *		_fstat (MSVCRT.@)
  */
-int _fstat(int fd, struct _stat* buf)
+int MSVCRT__fstat(int fd, struct _stat* buf)
 {
   DWORD dw;
   BY_HANDLE_FILE_INFORMATION hfi;
@@ -1135,7 +1135,7 @@ int _setmode(int fd,int mode)
 /*********************************************************************
  *		_stat (MSVCRT.@)
  */
-int _stat(const char* path, struct _stat * buf)
+int MSVCRT__stat(const char* path, struct _stat * buf)
 {
   DWORD dw;
   WIN32_FILE_ATTRIBUTE_DATA hfi;

dlls/msvcrt/msvcrt.spec

@@ -241,7 +241,7 @@ init    MSVCRT_Init
 @ cdecl _fputchar(long) _fputchar
 @ cdecl _fputwchar(long) _fputwchar
 @ cdecl _fsopen(str str long) _fsopen
-@ cdecl _fstat(long ptr) _fstat
+@ cdecl _fstat(long ptr) MSVCRT__fstat
 @ stub _fstati64 #(long ptr)
 @ cdecl _ftime(ptr) _ftime
 @ forward -noimport _ftol ntdll._ftol
@@ -446,7 +446,7 @@ init    MSVCRT_Init
 @ cdecl _spawnvp(long str ptr) _spawnvp
 @ cdecl _spawnvpe(long str ptr ptr) _spawnvpe
 @ forward -noimport _splitpath ntdll._splitpath
-@ cdecl _stat(str ptr) _stat
+@ cdecl _stat(str ptr) MSVCRT__stat
 @ stub _stati64 #(str ptr)
 @ cdecl _statusfp() _statusfp
 @ cdecl _strcmpi(str str) strcasecmp