Update.

	* dirent/dirent.h: Only define ino64_t if not already done.
	* posix/sys/types.h: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 6418ae1b01fba24fdb55be3f771f6692edd3cd43..64214d513d0e25d3bba0134aa8763b42f4b590b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-08-18  Ulrich Drepper  <drepper@cygnus.com>
 
+       * dirent/dirent.h: Only define ino64_t if not already done.
+       * posix/sys/types.h: Likewise.
+
        * ctype/ctype.h: Avoid useless #endif #if pairs.
 
        * dirent/dirent.h: Define ino_t and ino64_t if not done already.

diff --git a/dirent/dirent.h b/dirent/dirent.h
index 7154b52c853bb657bfe70cca88406800e9cc6ebe..f64c7fcfa5f5971fb1c6c57e5ca347eaeefa759e 100644 (file)
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -38,8 +38,9 @@ typedef __ino64_t ino_t;
 #  endif
 #  define __ino_t_defined
 # endif
-# ifdef __USE_LARGEFILE64
+# if defined __USE_LARGEFILE64 && !defined __ino64_t_defined
 typedef __ino64_t ino64_t;
+#  define __ino64_t_defined
 # endif
 #endif
 

diff --git a/posix/sys/types.h b/posix/sys/types.h
index 37c1cb16c839317ce6ff42d8a6a09d854872eaa3..a01cd255077496a32a12d1baa7b73643b0c885ab 100644 (file)
--- a/posix/sys/types.h
+++ b/posix/sys/types.h
@@ -49,8 +49,9 @@ typedef __ino64_t ino_t;
 # endif
 # define __ino_t_defined
 #endif
-#ifdef __USE_LARGEFILE64
+#if defined __USE_LARGEFILE64 && !defined __ino64_t_defined
 typedef __ino64_t ino64_t;
+# define __ino64_t_defined
 #endif
 
 #ifndef __dev_t_defined