From d89c031d8baca29e471faa4df23ee5d1fdafe6b2 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 11 Mar 2013 17:03:55 +0000
Subject: [PATCH] *"" is not constant according to gcc. So we move the
 responsibility for adding a , to the users of the macro.

---
 sys/net/npf/npf.h               | 4 ++--
 sys/net/npf/npf_ext_log.c       | 6 +++---
 sys/net/npf/npf_ext_normalise.c | 6 +++---
 sys/net/npf/npf_ext_rndblock.c  | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sys/net/npf/npf.h b/sys/net/npf/npf.h
index 5656dd0ab91f..ea534883e606 100644
--- a/sys/net/npf/npf.h
+++ b/sys/net/npf/npf.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf.h,v 1.28 2013/03/11 16:37:43 christos Exp $	*/
+/*	$NetBSD: npf.h,v 1.29 2013/03/11 17:03:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@ typedef uint8_t			npf_netmask_t;
 #define	NPF_DECISION_PASS	1
 
 #define	NPF_EXT_MODULE(name, req)	\
-    MODULE(MODULE_CLASS_MISC, name, req ? ("npf," req) : "npf")
+    MODULE(MODULE_CLASS_MISC, name, "npf" req)
 
 /*
  * Packet information cache.
diff --git a/sys/net/npf/npf_ext_log.c b/sys/net/npf/npf_ext_log.c
index 189a094bfbb3..5ed747f2ef03 100644
--- a/sys/net/npf/npf_ext_log.c
+++ b/sys/net/npf/npf_ext_log.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $	*/
+/*	$NetBSD: npf_ext_log.c,v 1.6 2013/03/11 17:03:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 2010-2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.6 2013/03/11 17:03:55 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ext_log.c,v 1.5 2013/03/11 16:37:43 christos Exp
 
 #include "npf_impl.h"
 
-NPF_EXT_MODULE(npf_ext_log, NULL);
+NPF_EXT_MODULE(npf_ext_log, "");
 
 #define	NPFEXT_LOG_VER		1
 
diff --git a/sys/net/npf/npf_ext_normalise.c b/sys/net/npf/npf_ext_normalise.c
index 99cfe4df7551..25c34ee4cf65 100644
--- a/sys/net/npf/npf_ext_normalise.c
+++ b/sys/net/npf/npf_ext_normalise.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $	*/
+/*	$NetBSD: npf_ext_normalise.c,v 1.4 2013/03/11 17:03:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.4 2013/03/11 17:03:55 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/module.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ext_normalise.c,v 1.3 2013/03/11 16:37:43 christ
 /*
  * NPF extension module definition and the identifier.
  */
-NPF_EXT_MODULE(npf_ext_normalise, NULL);
+NPF_EXT_MODULE(npf_ext_normalise, "");
 
 #define	NPFEXT_NORMALISE_VER	1
 
diff --git a/sys/net/npf/npf_ext_rndblock.c b/sys/net/npf/npf_ext_rndblock.c
index ce90da090da8..6d192ed333b5 100644
--- a/sys/net/npf/npf_ext_rndblock.c
+++ b/sys/net/npf/npf_ext_rndblock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $	*/
+/*	$NetBSD: npf_ext_rndblock.c,v 1.3 2013/03/11 17:03:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.3 2013/03/11 17:03:55 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/cprng.h>
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ext_rndblock.c,v 1.2 2013/03/11 16:37:43 christo
 /*
  * NPF extension module definition and the identifier.
  */
-NPF_EXT_MODULE(npf_ext_rndblock, NULL);
+NPF_EXT_MODULE(npf_ext_rndblock, "");
 
 #define	NPFEXT_RNDBLOCK_VER		1