about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--posix/Makefile1
-rw-r--r--resolv/Makefile2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a4e316cb0a..0fdbac0d4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-10-19  Joseph Myers  <joseph@codesourcery.com>
 
+	* posix/Makefile (CFLAGS-regex.c): Remove variable.
+	* resolv/Makefile (+cflags): Do not use -Wno-strict-prototypes.
+
 	* crypt/crypt-entry.c (__crypt_r): Convert to prototype-style
 	function definition.
 	* crypt/crypt_util.c (__encrypt_r): Likewise.
diff --git a/posix/Makefile b/posix/Makefile
index cbc4bc6708..aeb9890ba9 100644
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -189,7 +189,6 @@ $(objpfx)config-name.h: $(..)scripts/config-uname.sh $(common-objpfx)config.make
 	   '$(config-machine)-$(config-vendor)' > $@.new
 	mv -f $@.new $@
 
-CFLAGS-regex.c = -Wno-strict-prototypes
 CFLAGS-getaddrinfo.c = -DRESOLVER -fexceptions
 CFLAGS-pause.c = -fexceptions -fasynchronous-unwind-tables
 CFLAGS-pread.c = -fexceptions -fasynchronous-unwind-tables
diff --git a/resolv/Makefile b/resolv/Makefile
index add74875c6..683d010141 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -94,7 +94,7 @@ CFLAGS-libresolv += $(stack-protector)
 CFLAGS-res_hconf.c = -fexceptions
 
 # The BIND code elicits some harmless warnings.
-+cflags += -Wno-strict-prototypes -Wno-write-strings
++cflags += -Wno-write-strings
 
 # The DNS NSS modules needs the resolver.
 $(objpfx)libnss_dns.so: $(objpfx)libresolv.so