1 files changed, 23 insertions, 39 deletions

diff --git a/winsup/cygwin/include/cygwin/stat.h b/winsup/cygwin/include/cygwin/stat.h
index 13c1e3bed..ed96fafd9 100644
--- a/winsup/cygwin/include/cygwin/stat.h
+++ b/winsup/cygwin/include/cygwin/stat.h
@@ -16,7 +16,26 @@ details. */
 extern "C" {
 #endif
 
+struct stat
+{
+  dev_t         st_dev;
+  ino_t         st_ino;
+  mode_t        st_mode;
+  nlink_t       st_nlink;
+  uid_t         st_uid;
+  gid_t         st_gid;
+  dev_t         st_rdev;
+  off_t         st_size;
+  timestruc_t   st_atim;
+  timestruc_t   st_mtim;
+  timestruc_t   st_ctim;
+  blksize_t     st_blksize;
+  blkcnt_t      st_blocks;
+  timestruc_t   st_birthtim;
+};
+
 #if defined (__INSIDE_CYGWIN__) || defined (_COMPILING_NEWLIB)
+#ifndef __x86_64__
 struct __stat32
 {
   __dev16_t	st_dev;
@@ -34,49 +53,14 @@ struct __stat32
   __blkcnt32_t  st_blocks;
   long          st_spare4[2];
 };
+#endif
 
-struct __stat64
-{
-  __dev32_t     st_dev;
-  __ino64_t     st_ino;
-  mode_t        st_mode;
-  nlink_t       st_nlink;
-  __uid32_t     st_uid;
-  __gid32_t     st_gid;
-  __dev32_t     st_rdev;
-  _off64_t      st_size;
-  timestruc_t   st_atim;
-  timestruc_t   st_mtim;
-  timestruc_t   st_ctim;
-  blksize_t     st_blksize;
-  __blkcnt64_t  st_blocks;
-  timestruc_t   st_birthtim;
-};
-
-extern int fstat64 (int fd, struct __stat64 *buf);
-extern int stat64 (const char *file_name, struct __stat64 *buf);
-extern int lstat64 (const char *file_name, struct __stat64 *buf);
+extern int fstat64 (int fd, struct stat *buf);
+extern int stat64 (const char *file_name, struct stat *buf);
+extern int lstat64 (const char *file_name, struct stat *buf);
 
 #endif
 
-struct stat
-{
-  dev_t         st_dev;
-  ino_t         st_ino;
-  mode_t        st_mode;
-  nlink_t       st_nlink;
-  uid_t         st_uid;
-  gid_t         st_gid;
-  dev_t         st_rdev;
-  off_t         st_size;
-  timestruc_t   st_atim;
-  timestruc_t   st_mtim;
-  timestruc_t   st_ctim;
-  blksize_t     st_blksize;
-  blkcnt_t      st_blocks;
-  timestruc_t   st_birthtim;
-};
-
 #define st_atime st_atim.tv_sec
 #define st_mtime st_mtim.tv_sec
 #define st_ctime st_ctim.tv_sec