summaryrefslogtreecommitdiff
path: root/libio/ioungetc.c
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 16:34:38 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2018-12-27 16:34:38 +0000
commit7576c27563a3e43c0a276bf222244bcaf220a6fa (patch)
treead96fd1f1b9b57a50005db7803f6b79e748bb820 /libio/ioungetc.c
parentab5f5211585bf0f33bbfa2d4aaf17e4f0d1fa564 (diff)
parent064374be911f72dfaec8a75f06da1f9fc1827712 (diff)
Merge branch 't/hurdsig-global-dispositions' into refs/top-bases/t/hurdsig-SA_SIGINFO
Diffstat (limited to 'libio/ioungetc.c')
-rw-r--r--libio/ioungetc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libio/ioungetc.c b/libio/ioungetc.c
index 093af744b4..59ebb06177 100644
--- a/libio/ioungetc.c
+++ b/libio/ioungetc.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
@@ -27,18 +27,18 @@
#include "libioP.h"
int
-_IO_ungetc (int c, _IO_FILE *fp)
+_IO_ungetc (int c, FILE *fp)
{
int result;
CHECK_FILE (fp, EOF);
if (c == EOF)
return EOF;
+ if (!_IO_need_lock (fp))
+ return _IO_sputbackc (fp, (unsigned char) c);
_IO_acquire_lock (fp);
result = _IO_sputbackc (fp, (unsigned char) c);
_IO_release_lock (fp);
return result;
}
-#ifdef weak_alias
weak_alias (_IO_ungetc, ungetc)
-#endif