summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <tschwinge@gnu.org>2009-06-23 00:27:28 +0200
committerThomas Schwinge <tschwinge@gnu.org>2009-06-24 14:50:22 +0200
commit8318c50ed4a37a06179e2d7bfb853299cdc40899 (patch)
treeba02612cf40d03053d8ed200b685a77f878e46dc
parent2753b921ca2d486e023de8f8d10b606e25ad1387 (diff)
We're now C99 inline safe -- apart from the Linux code in pfinet.
* Makeconf (CFLAGS): Don't append $(gnu89-inline-CFLAGS). * pfinet/Makefile (CFLAGS): Append $(gnu89-inline-CFLAGS).
-rw-r--r--Makeconf2
-rw-r--r--pfinet/Makefile5
2 files changed, 5 insertions, 2 deletions
diff --git a/Makeconf b/Makeconf
index e9b20452..236f1ecf 100644
--- a/Makeconf
+++ b/Makeconf
@@ -65,7 +65,7 @@ INCLUDES += -I$(..)include -I$(top_srcdir)/include
CPPFLAGS += $(INCLUDES) \
-D_GNU_SOURCE -D_IO_MTSAFE_IO -D_FILE_OFFSET_BITS=64 \
$($*-CPPFLAGS)
-CFLAGS += -std=gnu99 $(gnu89-inline-CFLAGS) -Wall -g -O3 \
+CFLAGS += -std=gnu99 -Wall -g -O3 \
$($*-CFLAGS)
# Include the configure-generated file of parameters.
diff --git a/pfinet/Makefile b/pfinet/Makefile
index 9bc97e80..cb3820d6 100644
--- a/pfinet/Makefile
+++ b/pfinet/Makefile
@@ -1,5 +1,6 @@
#
-# Copyright (C) 1995, 1996, 1997, 2000, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2000, 2007, 2009 Free Software Foundation,
+# Inc.
#
# This file is part of the GNU Hurd.
#
@@ -116,6 +117,8 @@ CPPFLAGS += -imacros $(srcdir)/config.h \
# Don't ask... We use Linux code. The problem was first noticed when
# compiling `pfinet' with GCC 4.2.
CFLAGS += -fno-strict-aliasing
+# It's too cumbersome to fix all these third-party header files.
+CFLAGS += $(gnu89-inline-CFLAGS)
asm/checksum.h: ../config.status
mkdir -p $(@D)