[hurd] 13/30: Fix build against glibc 2.21

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 918a8c2ce462cea65e3e7a614f19b4f5ae4ff1e1
Author: Samuel Thibault <address@hidden>
Date:   Mon Aug 31 01:02:57 2015 +0200

    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 ed2f6d0..b42e4c7 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 eeb1a2f..dbb7c6c 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>
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git