svn commit: branches/uClibc_0_9_28/libc/sysdeps/linux/common/bits

[pkj at uclibc.org]

Author: pkj
Date: 2007-02-02 04:50:17 -0800 (Fri, 02 Feb 2007)
New Revision: 17723

Log:
Backported from the main trunk:
* Make sure struct stat is identical to struct stat64 if
  __USE_FILE_OFFSET64 is defined. This was the case for all
  architectures except those that use packed structures by default
  (i.e., CRIS).


Modified:
   branches/uClibc_0_9_28/libc/sysdeps/linux/common/bits/stat.h


Changeset:
Modified: branches/uClibc_0_9_28/libc/sysdeps/linux/common/bits/stat.h
===================================================================
--- branches/uClibc_0_9_28/libc/sysdeps/linux/common/bits/stat.h	2007-02-02 12:41:16 UTC (rev 17722)
+++ branches/uClibc_0_9_28/libc/sysdeps/linux/common/bits/stat.h	2007-02-02 12:50:17 UTC (rev 17723)
@@ -38,10 +38,11 @@
 struct stat
 {
     __dev_t st_dev;			/* Device.  */
+#ifndef __USE_FILE_OFFSET64
     unsigned short int __pad1;
-#ifndef __USE_FILE_OFFSET64
     __ino_t st_ino;			/* File serial number.	*/
 #else
+    unsigned int __pad1;
     __ino_t __st_ino;			/* 32bit file serial number.	*/
 #endif
     __mode_t st_mode;			/* File mode.  */
@@ -49,10 +50,11 @@
     __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.  */
+#ifndef __USE_FILE_OFFSET64
     unsigned short int __pad2;
-#ifndef __USE_FILE_OFFSET64
     __off_t st_size;			/* Size of file, in bytes.  */
 #else
+    unsigned int __pad2;
     __off64_t st_size;			/* Size of file, in bytes.  */
 #endif
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */