From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 18 Aug 1999 19:12:32 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/pre-glibc-2_1_3~472
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8353b5f6fdb09ef1195b73cc82e8ed6aa46fc284;p=platform%2Fupstream%2Fglibc.git

Update.

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

diff --git a/ChangeLog b/ChangeLog
index 6418ae1..64214d5 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 7154b52..f64c7fc 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 37c1cb1..a01cd25 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