From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 27 Jun 2020 12:20:24 +0000 (+0000)
Subject: htl: Fix includes for lockfile
X-Git-Tag: glibc-2.32~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf2c8cc2c674dd6c1145c6984121ea4754b79162;p=thirdparty%2Fglibc.git

htl: Fix includes for lockfile

These only need exactly to use __libc_ptf_call.

* sysdeps/htl/flockfile.c: Include <libc-lockP.h> instead of
<libc-lock.h>
* sysdeps/htl/ftrylockfile.c: Include <libc-lockP.h> instead of
<errno.h>, <pthread.h>, <stdio-lock.h>
* sysdeps/htl/funlockfile.c: Include <libc-lockP.h> instead of
<pthread.h> and <stdio-lock.h>
---

diff --git a/sysdeps/htl/flockfile.c b/sysdeps/htl/flockfile.c
index 7d475e6e296..956b8b4128f 100644
--- a/sysdeps/htl/flockfile.c
+++ b/sysdeps/htl/flockfile.c
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
-#include <libc-lock.h>
+#include <libc-lockP.h>
 
 
 void
diff --git a/sysdeps/htl/ftrylockfile.c b/sysdeps/htl/ftrylockfile.c
index a4675456479..a99cdedb0d9 100644
--- a/sysdeps/htl/ftrylockfile.c
+++ b/sysdeps/htl/ftrylockfile.c
@@ -16,10 +16,8 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
-#include <pthread.h>
 #include <stdio.h>
-#include <stdio-lock.h>
+#include <libc-lockP.h>
 
 
 int
diff --git a/sysdeps/htl/funlockfile.c b/sysdeps/htl/funlockfile.c
index 70f6f2e773e..0b59efaa35c 100644
--- a/sysdeps/htl/funlockfile.c
+++ b/sysdeps/htl/funlockfile.c
@@ -16,9 +16,8 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <pthread.h>
 #include <stdio.h>
-#include <stdio-lock.h>
+#include <libc-lockP.h>
 
 
 void