diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:28:23 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 14:28:23 +0000 |
commit | dc3064332cec5ca6edc9a44f5f6111e506eb037b (patch) | |
tree | 79686327822b075f3970aec7ef73372142760047 /libio/iofread.c | |
parent | 86af500777f45066aa6a6817d4b695cf4b626c38 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/cvs/exc2signal-template' into cvs/exc2signal-template
Diffstat (limited to 'libio/iofread.c')
-rw-r--r-- | libio/iofread.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libio/iofread.c b/libio/iofread.c index 80ed3e7ebd..5ed05e9dbe 100644 --- a/libio/iofread.c +++ b/libio/iofread.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993-2016 Free Software Foundation, Inc. +/* Copyright (C) 1993-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -26,11 +26,11 @@ #include "libioP.h" -_IO_size_t -_IO_fread (void *buf, _IO_size_t size, _IO_size_t count, _IO_FILE *fp) +size_t +_IO_fread (void *buf, size_t size, size_t count, FILE *fp) { - _IO_size_t bytes_requested = size * count; - _IO_size_t bytes_read; + size_t bytes_requested = size * count; + size_t bytes_read; CHECK_FILE (fp, 0); if (bytes_requested == 0) return 0; @@ -41,7 +41,6 @@ _IO_fread (void *buf, _IO_size_t size, _IO_size_t count, _IO_FILE *fp) } libc_hidden_def (_IO_fread) -#ifdef weak_alias weak_alias (_IO_fread, fread) # ifndef _IO_MTSAFE_IO @@ -49,4 +48,3 @@ strong_alias (_IO_fread, __fread_unlocked) libc_hidden_def (__fread_unlocked) weak_alias (_IO_fread, fread_unlocked) # endif -#endif |