change declaration for protosw.h const symbolic strings to static, so that

they can be used by more than one source file without causing duplicate
definitions.
This commit is contained in:
plunky 2007-03-31 18:17:13 +00:00
parent 3b5501efa7
commit fb76dbd4fc
5 changed files with 32 additions and 16 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: hci_socket.c,v 1.9 2007/03/30 20:47:02 plunky Exp $ */
/* $NetBSD: hci_socket.c,v 1.10 2007/03/31 18:17:13 plunky Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@ -31,10 +31,11 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: hci_socket.c,v 1.9 2007/03/30 20:47:02 plunky Exp $");
__KERNEL_RCSID(0, "$NetBSD: hci_socket.c,v 1.10 2007/03/31 18:17:13 plunky Exp $");
#include "opt_bluetooth.h"
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
#define PRUREQUESTS
#define PRCOREQUESTS
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: l2cap_socket.c,v 1.5 2007/03/30 20:47:03 plunky Exp $ */
/* $NetBSD: l2cap_socket.c,v 1.6 2007/03/31 18:17:13 plunky Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@ -31,7 +31,13 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.5 2007/03/30 20:47:03 plunky Exp $");
__KERNEL_RCSID(0, "$NetBSD: l2cap_socket.c,v 1.6 2007/03/31 18:17:13 plunky Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
#define PRUREQUESTS
#define PRCOREQUESTS
#endif
#include <sys/param.h>
#include <sys/domain.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: rfcomm_socket.c,v 1.5 2007/03/30 20:47:03 plunky Exp $ */
/* $NetBSD: rfcomm_socket.c,v 1.6 2007/03/31 18:17:13 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@ -32,7 +32,13 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.5 2007/03/30 20:47:03 plunky Exp $");
__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.6 2007/03/31 18:17:13 plunky Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
#define PRUREQUESTS
#define PRCOREQUESTS
#endif
#include <sys/param.h>
#include <sys/domain.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: sco_socket.c,v 1.7 2007/03/30 20:47:03 plunky Exp $ */
/* $NetBSD: sco_socket.c,v 1.8 2007/03/31 18:17:13 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@ -30,7 +30,13 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.7 2007/03/30 20:47:03 plunky Exp $");
__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.8 2007/03/31 18:17:13 plunky Exp $");
/* load symbolic names */
#ifdef BLUETOOTH_DEBUG
#define PRUREQUESTS
#define PRCOREQUESTS
#endif
#include <sys/param.h>
#include <sys/domain.h>

View File

@ -1,4 +1,4 @@
/* $NetBSD: protosw.h,v 1.41 2007/03/04 06:03:41 christos Exp $ */
/* $NetBSD: protosw.h,v 1.42 2007/03/31 18:17:13 plunky Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@ -159,7 +159,7 @@ struct protosw {
#define PRU_NREQ 23
#ifdef PRUREQUESTS
const char * const prurequests[] = {
static const char * const prurequests[] = {
"ATTACH", "DETACH", "BIND", "LISTEN",
"CONNECT", "ACCEPT", "DISCONNECT", "SHUTDOWN",
"RCVD", "SEND", "ABORT", "CONTROL",
@ -202,7 +202,7 @@ const char * const prurequests[] = {
((cmd) >= PRC_REDIRECT_NET && (cmd) <= PRC_REDIRECT_TOSHOST)
#ifdef PRCREQUESTS
const char * const prcrequests[] = {
static const char * const prcrequests[] = {
"IFDOWN", "ROUTEDEAD", "#2", "DEC-BIT-QUENCH2",
"QUENCH", "MSGSIZE", "HOSTDEAD", "#7",
"NET-UNREACH", "HOST-UNREACH", "PROTO-UNREACH", "PORT-UNREACH",
@ -231,15 +231,12 @@ const char * const prcrequests[] = {
#define PRCO_NCMDS 2
#ifdef PRCOREQUESTS
const char * const prcorequests[] = {
static const char * const prcorequests[] = {
"GETOPT", "SETOPT",
};
#endif
#ifdef _KERNEL
extern const char * const prurequests[];
extern const char * const prcrequests[];
extern const char * const prcorequests[];
/*
* Monotonically increasing time values for slow and fast timers.
*/