summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--dirent/dirent.h3
-rw-r--r--posix/sys/types.h3
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6418ae1b01..64214d513d 100644
--- 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 7154b52c85..f64c7fcfa5 100644
--- 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 37c1cb16c8..a01cd25507 100644
--- 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