Changeset 95c675b in mainline for uspace/lib/c/generic/io/io.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• uspace/lib/c/generic/io/io.c (modified) (2 diffs)

uspace/lib/c/generic/io/io.c

@@ -793 +793 @@
 }
 
-int fseek(FILE *stream, off64_t offset, int whence)
+int fseek(FILE *stream, long offset, int whence)
 {
         int rc;
@@ -831 +831 @@
 }
 
-off64_t ftell(FILE *stream)
+long ftell(FILE *stream)
 {
         /* The native position is too large for the C99-ish interface. */
-        if (stream->pos - stream->ungetc_chars > INT64_MAX)
+        if (stream->pos - stream->ungetc_chars > LONG_MAX)
                 return EOF;