From 951968c88a2a705ebe7bbb1ac02cd64f8f899f5b Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Fri, 4 Dec 2020 15:50:15 +0100 Subject: [PATCH] msvcrt: Use _stat64 definition from public header. Signed-off-by: Piotr Caban Signed-off-by: Alexandre Julliard --- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/msvcrt.h | 56 -------------------------------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1ef72c31057..21ef0e82408 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3003,7 +3003,7 @@ int CDECL _stat64(const char* path, struct _stat64 * buf) return -1; } - memset(buf,0,sizeof(struct MSVCRT__stat64)); + memset(buf,0,sizeof(struct _stat64)); /* FIXME: rdev isn't drive num, despite what the docs say-what is it? Bon 011120: This FIXME seems incorrect @@ -3159,7 +3159,7 @@ int CDECL _wstat64(const wchar_t* path, struct _stat64 * buf) return -1; } - memset(buf,0,sizeof(struct MSVCRT__stat64)); + memset(buf,0,sizeof(struct _stat64)); /* FIXME: rdev isn't drive num, despite what the docs says-what is it? */ if (iswalpha(*path) && path[1] == ':') diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 48b2ddfce72..5416dd9966e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,62 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -struct MSVCRT__stat32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct MSVCRT__stat32i64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct MSVCRT__stat64i32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - -struct MSVCRT__stat64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_NO_CONSOLE_FD (-2)