git: 191d5e3704a9 - stable/13 - zlib: silence K&R warns

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Sun, 09 Apr 2023 21:35:26 UTC
The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=191d5e3704a96611dac2ebaa035fdcd3afd63be5

commit 191d5e3704a96611dac2ebaa035fdcd3afd63be5
Author:     Mateusz Guzik <mjg@FreeBSD.org>
AuthorDate: 2023-02-12 21:12:34 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-04-09 14:56:20 +0000

    zlib: silence K&R warns
    
    Sponsored by:   Rubicon Communications, LLC ("Netgate")
    
    (cherry picked from commit eca005d8531fd153f46f941f3101e73cdf181a0b)
---
 sys/conf/files            | 18 +++++++++++-------
 sys/modules/zlib/Makefile |  2 ++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 17dcd22facc7..d1024ae8b8bb 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -4141,28 +4141,32 @@ libkern/strtouq.c		standard
 libkern/strvalid.c		standard
 libkern/timingsafe_bcmp.c	standard
 contrib/zlib/adler32.c		optional crypto | geom_uzip | \
-	mxge | ddb_ctf | gzio | zfs | zlib
+	mxge | ddb_ctf | gzio | zfs | zlib \
+	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"
 contrib/zlib/compress.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
-	compile-with "${NORMAL_C} -Wno-cast-qual"
+	compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype"
 contrib/zlib/crc32.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"
 contrib/zlib/deflate.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
-	compile-with "${NORMAL_C} -Wno-cast-qual"
+	compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype"
 contrib/zlib/inffast.c		optional crypto | geom_uzip | \
-	mxge | ddb_ctf | gzio | zfs | zlib
+	mxge | ddb_ctf | gzio | zfs | zlib \
+	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"
 contrib/zlib/inflate.c		optional crypto | geom_uzip | \
-	mxge | ddb_ctf | gzio | zfs | zlib
+	mxge | ddb_ctf | gzio | zfs | zlib \
+	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"
 contrib/zlib/inftrees.c		optional crypto | geom_uzip | \
-	mxge | ddb_ctf | gzio | zfs | zlib
+	mxge | ddb_ctf | gzio | zfs | zlib \
+	compile-with "${NORMAL_C} -Wno-deprecated-non-prototype"
 contrib/zlib/trees.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"
 contrib/zlib/uncompr.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
-	compile-with "${NORMAL_C} -Wno-cast-qual"
+	compile-with "${NORMAL_C} -Wno-cast-qual -Wno-deprecated-non-prototype"
 contrib/zlib/zutil.c		optional crypto | geom_uzip | \
 	mxge | ddb_ctf | gzio | zfs | zlib \
 	compile-with "${NORMAL_C} ${NO_WSTRICT_PROTOTYPES}"
diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile
index 6391255e512b..178d3a3f7ab7 100644
--- a/sys/modules/zlib/Makefile
+++ b/sys/modules/zlib/Makefile
@@ -25,4 +25,6 @@ CWARNFLAGS.crc32.c+=${NO_WSTRICT_PROTOTYPES} # crc32.c:586
 CWARNFLAGS.trees.c+=${NO_WSTRICT_PROTOTYPES} # trees.c:232
 CWARNFLAGS.zutil.c+=${NO_WSTRICT_PROTOTYPES} # zutil.c:27,32
 
+CWARNFLAGS+=-Wno-deprecated-non-prototype
+
 .include <bsd.kmod.mk>