Module Name:    src
Committed By:   rin
Date:           Mon Nov 13 02:33:13 UTC 2017

Modified Files:
        src/external/bsd/nvi/usr.bin/nvi: Makefile

Log Message:
- Add -Wno-unused and -Wno-unsequenced for gcc and clang, respectively.
  This is because encoding conversion macros yield such like:

    #define FILE2INT5(sp,buf,n,nlen,w,wlen) (w = n, wlen = nlen, 0)

- Silence gcc warnings on nonliteral arguments for snprintf(3) in v_increment.c,
  that are overlooked for swprintf(3) in the case of USE_WIDECHAR == "yes".


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/nvi/usr.bin/nvi/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.10 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.11
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.10	Mon Nov 13 01:51:47 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile	Mon Nov 13 02:33:13 2017
@@ -1,10 +1,17 @@
-#	$NetBSD: Makefile,v 1.10 2017/11/13 01:51:47 rin Exp $
+#	$NetBSD: Makefile,v 1.11 2017/11/13 02:33:13 rin Exp $
 
 .include <bsd.own.mk>
 
 USE_WIDECHAR?=yes
 
 CWARNFLAGS.clang+=	-Wno-uninitialized -Wno-format-security
+.if ${USE_WIDECHAR} != "yes"
+CWARNFLAGS.gcc+=	-Wno-unused
+CWARNFLAGS.clang+=	-Wno-unsequenced
+ .ifdef HAVE_GCC
+COPTS.v_increment.c+=	-Wno-format-nonliteral
+ .endif
+.endif
 
 CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. -DGTAGS
 CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H

Reply via email to