From dc2d175721df8ceb801d50581df95b49c26a6ff7 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Mon, 18 Dec 2017 20:15:27 +0100
Subject: [PATCH] newlib: ftello{64}: Fix type of returned value

Especially don't just use -1L since _off_t/_off64_t are not
guaranteed to be of type long.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
---
 newlib/libc/stdio/ftello.c     | 8 ++++----
 newlib/libc/stdio64/ftello64.c | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/newlib/libc/stdio/ftello.c b/newlib/libc/stdio/ftello.c
index c120c26a9..0a9bb7bd6 100644
--- a/newlib/libc/stdio/ftello.c
+++ b/newlib/libc/stdio/ftello.c
@@ -99,7 +99,7 @@ _DEFUN(_ftello_r, (ptr, fp),
     {
       ptr->_errno = ESPIPE;
       _newlib_flockfile_exit (fp);
-      return -1L;
+      return (_off_t) -1;
     }
 
   /* Find offset of underlying I/O object, then adjust for buffered
@@ -113,10 +113,10 @@ _DEFUN(_ftello_r, (ptr, fp),
   else
     {
       pos = fp->_seek (ptr, fp->_cookie, (_fpos_t) 0, SEEK_CUR);
-      if (pos == -1L)
+      if (pos == (_fpos_t) -1)
         {
           _newlib_flockfile_exit (fp);
-          return pos;
+          return (_off_t) -1;
         }
     }
   if (fp->_flags & __SRD)
@@ -141,7 +141,7 @@ _DEFUN(_ftello_r, (ptr, fp),
     }
 
   _newlib_flockfile_end (fp);
-  return pos;
+  return (_off_t) pos;
 }
 
 #ifndef _REENT_ONLY
diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c
index c6226d105..9aca231ef 100644
--- a/newlib/libc/stdio64/ftello64.c
+++ b/newlib/libc/stdio64/ftello64.c
@@ -96,7 +96,7 @@ _DEFUN (_ftello64_r, (ptr, fp),
     {
       ptr->_errno = ESPIPE;
       _newlib_flockfile_exit(fp);
-      return -1L;
+      return (_off64_t) -1;
     }
 
   /* Find offset of underlying I/O object, then adjust for buffered
@@ -110,10 +110,10 @@ _DEFUN (_ftello64_r, (ptr, fp),
   else
     {
       pos = fp->_seek64 (ptr, fp->_cookie, (_fpos64_t) 0, SEEK_CUR);
-      if (pos == -1L)
+      if (pos == (_fpos64_t) -1)
         {
           _newlib_flockfile_exit(fp);
-          return pos;
+          return (_off64_t) pos;
         }
     }
   if (fp->_flags & __SRD)
@@ -138,7 +138,7 @@ _DEFUN (_ftello64_r, (ptr, fp),
     }
 
   _newlib_flockfile_end(fp);
-  return pos;
+  return (_off64_t) pos;
 }
 
 #ifndef _REENT_ONLY