about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-12-16 18:25:45 +0000
committerUlrich Drepper <drepper@redhat.com>2000-12-16 18:25:45 +0000
commit0a70515e2ebc0060ab53b83cd9c0a379706da986 (patch)
tree19ab873658fba2dd7a45577bd5bc89eb0c47e0aa /sysdeps
parent3d73829c187f7d34c5c3c44047da1137adf36d86 (diff)
downloadglibc-0a70515e2ebc0060ab53b83cd9c0a379706da986.tar.gz
glibc-0a70515e2ebc0060ab53b83cd9c0a379706da986.tar.xz
glibc-0a70515e2ebc0060ab53b83cd9c0a379706da986.zip
Update.
2000-12-16  Jakub Jelinek  <jakub@redhat.com>

	* catgets/gencat.c (read_input_file): Avoid calling obstack_free
	with a pointer not returned by obstack_ functions.

	* sysdeps/unix/sysv/aix/bits/stat.h (struct stat): Align with AIX
	version.
	(struct stat64): Likewise.
	Reported by Michael Keezer <mkeezer@redhat.com>.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/aix/bits/stat.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/sysdeps/unix/sysv/aix/bits/stat.h b/sysdeps/unix/sysv/aix/bits/stat.h
index 2d5585debb..0b818795e7 100644
--- a/sysdeps/unix/sysv/aix/bits/stat.h
+++ b/sysdeps/unix/sysv/aix/bits/stat.h
@@ -23,11 +23,7 @@
 struct stat
   {
     __dev_t st_dev;			/* Device.  */
-#ifndef __USE_FILE_OFFSET64
     __ino_t st_ino;			/* File serial number.	*/
-#else
-    __ino64_t st_ino;			/* File serial number.	*/
-#endif
     __mode_t st_mode;			/* File mode.  */
     __nlink_t st_nlink;			/* Link count.  */
     unsigned short int st_flag;		/* Flag word.  */
@@ -46,11 +42,7 @@ struct stat
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int __unused3;
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
-#ifndef __USE_FILE_OFFSET64
     __blkcnt_t st_blocks;		/* Number 512-byte blocks allocated. */
-#else
-    __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
-#endif
     int st_vfstype;			/* Type of the filesystem.  */
     unsigned int st_vfs;		/* Vfs number.  */
     unsigned int st_type;		/* Vnode type.  */
@@ -69,7 +61,7 @@ struct stat
 struct stat64
   {
     __dev_t st_dev;			/* Device.  */
-    __ino64_t st_ino;			/* File serial number.	*/
+    __ino_t st_ino;			/* File serial number.	*/
     __mode_t st_mode;			/* File mode.  */
     __nlink_t st_nlink;			/* Link count.  */
     unsigned short int st_flag;		/* Flag word.  */
@@ -84,7 +76,7 @@ struct stat64
     __time_t st_ctime;			/* Time of last status change.  */
     unsigned long int __unused3;
     __blksize_t st_blksize;		/* Optimal block size for I/O.  */
-    __blkcnt64_t st_blocks;		/* Number 512-byte blocks allocated. */
+    __blkcnt_t st_blocks;		/* Number 512-byte blocks allocated. */
     int st_vfstype;			/* Type of the filesystem.  */
     unsigned int st_vfs;		/* Vfs number.  */
     unsigned int st_type;		/* Vnode type.  */