svn commit: r291044 - in stable/10/contrib/netbsd-tests/lib/libc: gen regex

[Garrett Cooper]

Author: ngie
Date: Thu Nov 19 00:25:58 2015
New Revision: 291044
URL: https://svnweb.freebsd.org/changeset/base/291044

Log:
  MFC r290847:
  
  Fix -Wunused warnings with variables used unlit code by adding appropriate #ifdef
  guards around the variables
  
  Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/contrib/netbsd-tests/lib/libc/gen/t_glob.c
  stable/10/contrib/netbsd-tests/lib/libc/regex/debug.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/netbsd-tests/lib/libc/gen/t_glob.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/gen/t_glob.c	Thu Nov 19 00:19:09 2015	(r291043)
+++ stable/10/contrib/netbsd-tests/lib/libc/gen/t_glob.c	Thu Nov 19 00:25:58 2015	(r291044)
@@ -91,9 +91,11 @@ static struct gl_dir d[] = {
 	{ "a/b", b, __arraycount(b), 0 },
 };
 
+#ifndef __FreeBSD__
 static const char *glob_star[] = {
     "a/1", "a/3", "a/4", "a/b", "a/b/w", "a/b/x", "a/b/y", "a/b/z",
 };
+#endif
 
 static const char *glob_star_not[] = {
 	"a/1", "a/3", "a/4", "a/b",

Modified: stable/10/contrib/netbsd-tests/lib/libc/regex/debug.c
==============================================================================
--- stable/10/contrib/netbsd-tests/lib/libc/regex/debug.c	Thu Nov 19 00:19:09 2015	(r291043)
+++ stable/10/contrib/netbsd-tests/lib/libc/regex/debug.c	Thu Nov 19 00:25:58 2015	(r291044)
@@ -126,11 +126,15 @@ static void
 s_print(struct re_guts *g, FILE *d)
 {
 	sop *s;
+#ifdef __NetBSD__
 	cset *cs;
+#endif
 	int done = 0;
 	sop opnd;
 	int col = 0;
+#ifdef __NetBSD__
 	ssize_t last;
+#endif
 	sopno offset = 2;
 #	define	GAP()	{	if (offset % 5 == 0) { \
 					if (col > 40) { \