summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2015-08-31 01:02:57 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2015-08-31 01:03:56 +0200
commit918a8c2ce462cea65e3e7a614f19b4f5ae4ff1e1 (patch)
tree5069eae23c8d9bede3b1eb66c414c265bc455ceb
parent346ace4c2f5e020ca654541ff4b34d86faf88a4d (diff)
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.
-rw-r--r--Makeconf2
-rw-r--r--libthreads/lockfile.c3
2 files changed, 4 insertions, 1 deletions
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>