From 09ba6794c68c123caa9706245882d87febed0aff Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 17 Mar 2016 01:26:54 +0100
Subject: Fix build against glibc 2.23

---
 forward.c                           | 2 +-
 pthread/pt-initialize.c             | 2 +-
 sysdeps/pthread/flockfile.c         | 2 +-
 sysdeps/pthread/ftrylockfile.c      | 2 +-
 sysdeps/pthread/funlockfile.c       | 2 +-
 sysdeps/pthread/pthread-functions.h | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/forward.c b/forward.c
index 771b3ca..c04f47c 100644
--- a/forward.c
+++ b/forward.c
@@ -132,7 +132,7 @@ FORWARD (pthread_mutex_unlock, (pthread_mutex_t *mutex), (mutex), 0)
 FORWARD2 (pthread_self, pthread_t, (void), (), return 0)
 
 
-FORWARD (pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
+FORWARD (__pthread_setcancelstate, (int state, int *oldstate), (state, oldstate),
 	 0)
 
 FORWARD (pthread_setcanceltype, (int type, int *oldtype), (type, oldtype), 0)
diff --git a/pthread/pt-initialize.c b/pthread/pt-initialize.c
index 9e5404b..4435a36 100644
--- a/pthread/pt-initialize.c
+++ b/pthread/pt-initialize.c
@@ -61,7 +61,7 @@ static const struct pthread_functions pthread_functions =
     .ptr_pthread_mutex_trylock = __pthread_mutex_trylock,
     .ptr_pthread_mutex_unlock = __pthread_mutex_unlock,
     .ptr_pthread_self = __pthread_self,
-    .ptr_pthread_setcancelstate = __pthread_setcancelstate,
+    .ptr___pthread_setcancelstate = __pthread_setcancelstate,
     .ptr_pthread_setcanceltype = __pthread_setcanceltype,
     .ptr___pthread_get_cleanup_stack = __pthread_get_cleanup_stack,
     .ptr_pthread_once = __pthread_once,
diff --git a/sysdeps/pthread/flockfile.c b/sysdeps/pthread/flockfile.c
index 89e690d..b552cd6 100644
--- a/sysdeps/pthread/flockfile.c
+++ b/sysdeps/pthread/flockfile.c
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include <libio.h>
-#include <bits/libc-lock.h>
+#include <libc-lock.h>
 
 
 void
diff --git a/sysdeps/pthread/ftrylockfile.c b/sysdeps/pthread/ftrylockfile.c
index e8f8060..c33de88 100644
--- a/sysdeps/pthread/ftrylockfile.c
+++ b/sysdeps/pthread/ftrylockfile.c
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <pthread.h>
 #include <stdio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 int
diff --git a/sysdeps/pthread/funlockfile.c b/sysdeps/pthread/funlockfile.c
index 65201ed..05edc66 100644
--- a/sysdeps/pthread/funlockfile.c
+++ b/sysdeps/pthread/funlockfile.c
@@ -19,7 +19,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <libio.h>
-#include <bits/stdio-lock.h>
+#include <stdio-lock.h>
 
 
 void
diff --git a/sysdeps/pthread/pthread-functions.h b/sysdeps/pthread/pthread-functions.h
index 7fc4a53..0fc8968 100644
--- a/sysdeps/pthread/pthread-functions.h
+++ b/sysdeps/pthread/pthread-functions.h
@@ -114,7 +114,7 @@ struct pthread_functions
   int (*ptr_pthread_mutex_trylock) (pthread_mutex_t *);
   int (*ptr_pthread_mutex_unlock) (pthread_mutex_t *);
   pthread_t (*ptr_pthread_self) (void);
-  int (*ptr_pthread_setcancelstate) (int, int *);
+  int (*ptr___pthread_setcancelstate) (int, int *);
   int (*ptr_pthread_setcanceltype) (int, int *);
   struct __pthread_cancelation_handler **(*ptr___pthread_get_cleanup_stack) (void);
   int (*ptr_pthread_once) (pthread_once_t *, void (*) (void));
-- 
cgit v1.2.3