diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:26:46 +0000 |
commit | df6d86d8822458cf787b5f5620490d6a962da3b8 (patch) | |
tree | 8d499fa24a32a195bd6e384dfb70639c45c4a9bb /libio/fileno.c | |
parent | 2c7242b971fd7b63fa842df15ec6fa3d0ff8aeb0 (diff) | |
parent | 1949a12d5da678a8532359a95717d8e63910d93b (diff) |
Merge commit 'refs/top-bases/t/____longjmp_chk' into t/____longjmp_chkt/____longjmp_chk
Diffstat (limited to 'libio/fileno.c')
-rw-r--r-- | libio/fileno.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libio/fileno.c b/libio/fileno.c index 4a8e91b4b6..f49c588a96 100644 --- a/libio/fileno.c +++ b/libio/fileno.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 @@ -28,7 +28,7 @@ #include <stdio.h> int -__fileno (_IO_FILE *fp) +__fileno (FILE *fp) { CHECK_FILE (fp, EOF); @@ -44,10 +44,8 @@ libc_hidden_def (__fileno) weak_alias (__fileno, fileno) libc_hidden_weak (fileno) -#ifdef weak_alias /* The fileno implementation for libio does not require locking because it only accesses once a single variable and this is already atomic (at least at thread level). Therefore we don't test _IO_MTSAFE_IO here. */ weak_alias (__fileno, fileno_unlocked) -#endif |