From: corinna <corinna>
Date: Tue, 6 Jul 2010 15:23:25 +0000 (+0000)
Subject: 	* libc/posix/rewinddir.c (rewinddir): Remove incorrect cast to off_t.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=16943cf5cd9fc33d6b7409fcd21cf03953b513ba;p=pf3gnuchains%2Fpf3gnuchains4x.git

	* libc/posix/rewinddir.c (rewinddir): Remove incorrect cast to off_t.
	* libc/sys/rtems/sys/dirent.h (_seekdir): Add prototype.
	* libc/sys/linux/sys/dirent.h (_seekdir): Fix prototype to use long
	rather than off_t.
---

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d459e6d092..d1933e92ee 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-06  Corinna Vinschen  <corinna@vinschen.de>
+
+	* libc/posix/rewinddir.c (rewinddir): Remove incorrect cast to off_t.
+	* libc/sys/rtems/sys/dirent.h (_seekdir): Add prototype.
+	* libc/sys/linux/sys/dirent.h (_seekdir): Fix prototype to use long
+	rather than off_t.
+
 2010-07-01  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
 
 	* libc/include/signal.h (sighandler_t): Add typedef.
diff --git a/newlib/libc/posix/rewinddir.c b/newlib/libc/posix/rewinddir.c
index bffad96123..f9ca9f7d40 100644
--- a/newlib/libc/posix/rewinddir.c
+++ b/newlib/libc/posix/rewinddir.c
@@ -48,7 +48,7 @@ _DEFUN(rewinddir, (dirp),
 #ifdef HAVE_DD_LOCK
 	__lock_acquire_recursive(dirp->dd_lock);
 #endif
-	_seekdir((dirp), (off_t)0);
+	_seekdir((dirp), 0L);
 #ifdef HAVE_DD_LOCK
 	__lock_release_recursive(dirp->dd_lock);
 #endif
diff --git a/newlib/libc/sys/linux/sys/dirent.h b/newlib/libc/sys/linux/sys/dirent.h
index 58d774594b..ec8ed89d47 100644
--- a/newlib/libc/sys/linux/sys/dirent.h
+++ b/newlib/libc/sys/linux/sys/dirent.h
@@ -40,7 +40,7 @@ void rewinddir(DIR *);
 int closedir(DIR *);
 
 /* internal prototype */
-void _seekdir(DIR *dir,off_t offset);
+void _seekdir(DIR *dir, long offset);
 DIR *_opendir(const char *);
 
 #ifndef _POSIX_SOURCE
diff --git a/newlib/libc/sys/rtems/sys/dirent.h b/newlib/libc/sys/rtems/sys/dirent.h
index fa31828245..9cd4f36576 100644
--- a/newlib/libc/sys/rtems/sys/dirent.h
+++ b/newlib/libc/sys/rtems/sys/dirent.h
@@ -31,6 +31,10 @@ int closedir(DIR *);
 void seekdir(DIR *dir, long loc);
 long telldir(DIR *dir);
 
+#ifdef _COMPILING_NEWLIB
+void _seekdir(DIR *dir, long offset);
+#endif
+
 #include <sys/types.h>
 
 #include <limits.h>