(struct stat): Change definition to use prescribed types for elements.

diff --git a/sysdeps/unix/sysv/linux/alpha/statbuf.h b/sysdeps/unix/sysv/linux/alpha/statbuf.h
index 92c9df7404cbacdb1a3cc1e9f28451f7df4a008d..207fa0ca1cc8701d9146140decd8bcfbffe8f976 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/statbuf.h
+++ b/sysdeps/unix/sysv/linux/alpha/statbuf.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,30 +19,30 @@
 #ifndef        _STATBUF_H
 #define        _STATBUF_H      1
 
-/* The Alpha has no additional syscall versions.  */
-
 /* Versions of the `struct stat' data structure.  */
-#define _STAT_VER              0
+#define _STAT_VER_LINUX_OLD    0
+#define _STAT_VER_LINUX                1
+#define _STAT_VER              _STAT_VER_LINUX
 
 /* Versions of the `xmknod' interface.  */
 #define _MKNOD_VER_LINUX       0
 
 struct stat
   {
-    unsigned int st_dev;               /* Device.  */
-    unsigned int st_ino;               /* File serial number.  */
-    unsigned int st_mode;              /* File mode.  */
-    unsigned int st_nlink;             /* Link count.  */
-    unsigned int st_uid;               /* User ID of the file's owner. */
-    unsigned int st_gid;               /* Group ID of the file's group.*/
-    unsigned int st_rdev;              /* Device number, if device.  */
-    long int st_size;                  /* Size of file, in bytes.  */
-    unsigned long int st_atime;                /* Time of last access.  */
-    unsigned long int st_mtime;                /* Time of last modification.  */
-    unsigned long int st_ctime;                /* Time of last status change.  */
-    unsigned int st_blksize;           /* Optimal block size for I/O.  */
-#define        _STATBUF_ST_BLKSIZE             /* Tell code we have this member.  */
-    int st_blocks;                     /* Nr. of 512-byte blocks allocated.  */
+    __dev_t st_dev;            /* Device.  */
+    __ino_t st_ino;            /* File serial number.  */
+    __mode_t st_mode;          /* File mode.  */
+    __nlink_t st_nlink;                /* Link count.  */
+    __uid_t st_uid;            /* User ID of the file's owner. */
+    __gid_t st_gid;            /* Group ID of the file's group.*/
+    __dev_t st_rdev;           /* Device number, if device.  */
+    __off_t st_size;           /* Size of file, in bytes.  */
+    __time_t st_atime;         /* Time of last access.  */
+    __time_t st_mtime;         /* Time of last modification.  */
+    __time_t st_ctime;         /* Time of last status change.  */
+    unsigned int st_blksize;   /* Optimal block size for I/O.  */
+#define        _STATBUF_ST_BLKSIZE     /* Tell code we have this member.  */
+    int st_blocks;             /* Nr. of 512-byte blocks allocated.  */
     unsigned int st_flags;
     unsigned int st_gen;
   };

diff --git a/sysdeps/unix/sysv/linux/statbuf.h b/sysdeps/unix/sysv/linux/statbuf.h
index 39bbdc9ece99e40a7a0d7b194111bf76b3e0ace3..15ffe637bcf6643b0e70e145e5ef33b5b276807c 100644 (file)
--- a/sysdeps/unix/sysv/linux/statbuf.h
+++ b/sysdeps/unix/sysv/linux/statbuf.h
@@ -20,8 +20,9 @@
 #define        _STATBUF_H      1
 
 /* Versions of the `struct stat' data structure.  */
-#define _STAT_VER_LINUX                1
+#define _STAT_VER_LINUX_OLD    1
 #define _STAT_VER_SVR4         2
+#define _STAT_VER_LINUX                3
 #define _STAT_VER              _STAT_VER_LINUX /* The one defined below.  */
 
 /* Versions of the `xmknod' interface.  */
@@ -32,25 +33,25 @@
 
 struct stat
   {
-    unsigned short int st_dev;         /* Device.  */
+    __dev_t st_dev;                    /* Device.  */
     unsigned short int __pad1;
-    unsigned long int st_ino;          /* File serial number.  */
-    unsigned short int st_mode;                /* File mode.  */
-    unsigned short int st_nlink;       /* Link count.  */
-    unsigned short int st_uid;         /* User ID of the file's owner. */
-    unsigned short int st_gid;         /* Group ID of the file's group.*/
-    unsigned short int st_rdev;                /* Device number, if device.  */
+    __ino_t st_ino;                    /* File serial number.  */
+    __mode_t st_mode;                  /* File mode.  */
+    __nlink_t st_nlink;                        /* Link count.  */
+    __uid_t st_uid;                    /* User ID of the file's owner. */
+    __gid_t st_gid;                    /* Group ID of the file's group.*/
+    __dev_t st_rdev;                   /* Device number, if device.  */
     unsigned short int __pad2;
-    long int st_size;                  /* Size of file, in bytes.  */
+    __off_t st_size;                   /* Size of file, in bytes.  */
     unsigned long int st_blksize;      /* Optimal block size for I/O.  */
 #define        _STATBUF_ST_BLKSIZE             /* Tell code we have this member.  */
 
     unsigned long int st_blocks;       /* Number of 512-byte blocks allocated.  */
-    long int st_atime;                 /* Time of last access.  */
+    __time_t st_atime;                 /* Time of last access.  */
     unsigned long int __unused1;
-    long int st_mtime;                 /* Time of last modification.  */
+    __time_t st_mtime;                 /* Time of last modification.  */
     unsigned long int __unused2;
-    long int st_ctime;                 /* Time of last status change.  */
+    __time_t st_ctime;                 /* Time of last status change.  */
     unsigned long int __unused3;
     unsigned long int __unused4;
     unsigned long int __unused5;