From c508bf7a545dd0acbcdd906fb119c9f8222e5026 Mon Sep 17 00:00:00 2001
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Fri, 8 Apr 2005 21:37:41 +0000
Subject: [PATCH] ISO C does not allow unnamed union members.

---
 sbin/ifconfig/ifconfig.c | 10 +++++-----
 sbin/ifconfig/ifconfig.h |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index eef77ec36c2e..b95a7a5c2af3 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -502,25 +502,25 @@ ifconfig(int argc, char *const *argv, const struct afswtch *afp)
 			 */
 			p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd);
 		}
-		if (p->c_func || p->c_func2) {
+		if (p->c_u.c_func || p->c_u.c_func2) {
 			if (p->c_parameter == NEXTARG) {
 				if (argv[1] == NULL)
 					errx(1, "'%s' requires argument",
 					    p->c_name);
-				p->c_func(argv[1], 0, s, afp);
+				p->c_u.c_func(argv[1], 0, s, afp);
 				argc--, argv++;
 			} else if (p->c_parameter == OPTARG) {
-				p->c_func(argv[1], 0, s, afp);
+				p->c_u.c_func(argv[1], 0, s, afp);
 				if (argv[1] != NULL)
 					argc--, argv++;
 			} else if (p->c_parameter == NEXTARG2) {
 				if (argc < 3)
 					errx(1, "'%s' requires 2 arguments",
 					    p->c_name);
-				p->c_func2(argv[1], argv[2], s, afp);
+				p->c_u.c_func2(argv[1], argv[2], s, afp);
 				argc -= 2, argv += 2;
 			} else
-				p->c_func(*argv, p->c_parameter, s, afp);
+				p->c_u.c_func(*argv, p->c_parameter, s, afp);
 		}
 		argc--, argv++;
 	}
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index d57517c0f2dd..505d8b153bab 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -51,7 +51,7 @@ struct cmd {
 	union {
 		c_func	*c_func;
 		c_func2	*c_func2;
-	};
+	} c_u;
 	struct cmd *c_next;
 };
 void	cmd_register(struct cmd *);