svn commit: r203987 - user/luigi/ipfw3-head/sbin/ipfw

[Luigi Rizzo]

Author: luigi
Date: Wed Feb 17 08:40:54 2010
New Revision: 203987
URL: http://svn.freebsd.org/changeset/base/203987

Log:
  permit building without altq (-DNO_ALTQ)

Modified:
  user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c

Modified: user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c
==============================================================================
--- user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c	Wed Feb 17 08:37:56 2010	(r203986)
+++ user/luigi/ipfw3-head/sbin/ipfw/ipfw2.c	Wed Feb 17 08:40:54 2010	(r203987)
@@ -1131,9 +1131,11 @@ show_ipfw(struct ip_fw *rule, int pcwidt
 		else
 			printf(" log");
 	}
+#ifndef NO_ALTQ
 	if (altqptr) {
 		print_altq_cmd(altqptr);
 	}
+#endif
 	if (tagptr) {
 		if (tagptr->len & F_NOT)
 			PRINT_UINT_ARG(" untag ", tagptr->arg1);
@@ -1733,8 +1735,10 @@ ipfw_sysctl_handler(int ac, char *av[], 
 	} else if (_substrcmp(*av, "dyn_keepalive") == 0) {
 		sysctlbyname("net.inet.ip.fw.dyn_keepalive", NULL, 0,
 		    &which, sizeof(which));
+#ifndef NO_ALTQ
 	} else if (_substrcmp(*av, "altq") == 0) {
 		altq_set_enabled(which);
+#endif
 	} else {
 		warnx("unrecognize enable/disable keyword: %s\n", *av);
 	}
@@ -2863,6 +2867,7 @@ chkarg:	
 		    }
 			break;
 
+#ifndef NO_ALTQ
 		case TOK_ALTQ:
 		    {
 			ipfw_insn_altq *a = (ipfw_insn_altq *)cmd;
@@ -2878,6 +2883,7 @@ chkarg:	
 			ac--; av++;
 		    }
 			break;
+#endif
 
 		case TOK_TAG:
 		case TOK_UNTAG: {