[src/trunk]: src/sys/netsmb don't mix static and non-static MALLOC_DEFINE()s ...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/75a20af343a3
branches:  trunk
changeset: 769886:75a20af343a3
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Sep 25 13:42:30 2011 +0000

description:
don't mix static and non-static MALLOC_DEFINE()s in the same file,
it fails to compile with gcc 4.5 on alpha.

diffstat:

 sys/netsmb/smb_subr.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r eeec4d4d73b7 -r 75a20af343a3 sys/netsmb/smb_subr.c
--- a/sys/netsmb/smb_subr.c     Sun Sep 25 13:40:37 2011 +0000
+++ b/sys/netsmb/smb_subr.c     Sun Sep 25 13:42:30 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smb_subr.c,v 1.35 2010/07/12 02:58:01 christos Exp $   */
+/*     $NetBSD: smb_subr.c,v 1.36 2011/09/25 13:42:30 chs Exp $        */
 
 /*
  * Copyright (c) 2000-2001 Boris Popov
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smb_subr.c,v 1.35 2010/07/12 02:58:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smb_subr.c,v 1.36 2011/09/25 13:42:30 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,7 +60,8 @@
 
 const smb_unichar smb_unieol = 0;
 
-static MALLOC_DEFINE(M_SMBSTR, "smbstr", "SMB strings");
+/* XXX M_SMBSTR could be static but that doesn't work with gcc 4.5 on alpha. */
+MALLOC_DEFINE(M_SMBSTR, "smbstr", "SMB strings");
 MALLOC_DEFINE(M_SMBTEMP, "smbtemp", "Temp netsmb data");
 
 void