From 918a8c2ce462cea65e3e7a614f19b4f5ae4ff1e1 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Mon, 31 Aug 2015 01:02:57 +0200
Subject: Fix build against glibc 2.21

* Makeconf (CPPFLAGS): Remove -D_IO_MTSAFE_IO.
* libthreads/lockfile.c (_IO_MTSAFE_IO): Define macro.
(IS_IN): Define macro to 0.
---
 Makeconf              | 2 +-
 libthreads/lockfile.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makeconf b/Makeconf
index ed2f6d0a..b42e4c79 100644
--- a/Makeconf
+++ b/Makeconf
@@ -77,7 +77,7 @@ INCLUDES += -I.. $(top_srcdirinc)
 endif
 INCLUDES += -I$(..)include -I$(top_srcdir)/include
 CPPFLAGS += $(INCLUDES) \
-	     -D_GNU_SOURCE -D_IO_MTSAFE_IO -D_FILE_OFFSET_BITS=64 \
+	     -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
 	    $($*-CPPFLAGS)
 CFLAGS += -std=gnu99 $(gnu89-inline-CFLAGS) -Wall -g -O3 \
 	    $($*-CFLAGS)
diff --git a/libthreads/lockfile.c b/libthreads/lockfile.c
index eeb1a2f3..dbb7c6c8 100644
--- a/libthreads/lockfile.c
+++ b/libthreads/lockfile.c
@@ -17,6 +17,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#define _IO_MTSAFE_IO
+#define IS_IN(lib) 0
+
 #include <cthreads.h>		/* Must come before <stdio.h>! */
 #include <stdio.h>
 
-- 
cgit v1.2.3