Add change from main branch.

3 files changed, 7 insertions, 7 deletions

diff --git a/sysdeps/unix/bsd/telldir.c b/sysdeps/unix/bsd/telldir.c
index 29ef72c41e..d9799b0f9b 100644
--- a/sysdeps/unix/bsd/telldir.c
+++ b/sysdeps/unix/bsd/telldir.c
@@ -39,18 +39,18 @@ __libc_lock_define_initialized(static, lock) /* Locks above data.  */
 
 
 /* Return the current position of DIRP.  */
-off_t
+long int
 telldir (dirp)
      DIR *dirp;
 {
   struct record *new;
-  off_t pos;
+  long int pos;
 
   __libc_lock_lock (lock);
 
   new = malloc (sizeof *new);
   if (new == NULL)
-    return (off_t) -1;
+    return -1l;
 
   new->pos = dirp->filepos;
   new->offset = dirp->offset;
@@ -71,7 +71,7 @@ telldir (dirp)
 void
 seekdir (dirp, pos)
      DIR *dirp;
-     __off_t pos;
+     long int pos;
 {
   struct record *r, **prevr;
 
diff --git a/sysdeps/unix/seekdir.c b/sysdeps/unix/seekdir.c
index caecbefd78..f9df9c18b4 100644
--- a/sysdeps/unix/seekdir.c
+++ b/sysdeps/unix/seekdir.c
@@ -27,10 +27,10 @@
 void
 seekdir (dirp, pos)
      DIR *dirp;
-     __off_t pos;
+     long int pos;
 {
   __libc_lock_lock (dirp->lock);
-  (void) __lseek(dirp->fd, pos, SEEK_SET);
+  (void) __lseek (dirp->fd, pos, SEEK_SET);
   dirp->size = 0;
   dirp->offset = 0;
   __libc_lock_unlock (dirp->lock);
diff --git a/sysdeps/unix/telldir.c b/sysdeps/unix/telldir.c
index f0ad95fd7c..bb898130de 100644
--- a/sysdeps/unix/telldir.c
+++ b/sysdeps/unix/telldir.c
@@ -21,7 +21,7 @@
 #include <dirstream.h>
 
 /* Return the current position of DIRP.  */
-off_t
+long int
 telldir (DIR *dirp)
 {
   return dirp->filepos;