[src/trunk]: src/sys/dev/vinum Change definitions to compile correctly withou...

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

details:   https://anonhg.NetBSD.org/src/rev/6d3d9dbbf82b
branches:  trunk
changeset: 553352:6d3d9dbbf82b
user:      grog <grog%NetBSD.org@localhost>
date:      Wed Oct 15 01:31:39 2003 +0000

description:
Change definitions to compile correctly without VINUMDEBUG flag.

Reported by:  hubertf

Remove $FreeBSD$ ID string.

diffstat:

 sys/dev/vinum/vinumext.h |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r e0d987e8dd10 -r 6d3d9dbbf82b sys/dev/vinum/vinumext.h
--- a/sys/dev/vinum/vinumext.h  Wed Oct 15 01:28:49 2003 +0000
+++ b/sys/dev/vinum/vinumext.h  Wed Oct 15 01:31:39 2003 +0000
@@ -33,8 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumext.h,v 1.1.1.1 2003/10/10 03:08:08 grog Exp $
- * $FreeBSD$
+ * $Id: vinumext.h,v 1.2 2003/10/15 01:31:39 grog Exp $
  */
 
 /* vinumext.h: external definitions */
@@ -160,11 +159,11 @@
 int vinum_mallocinfo(caddr_t data);
 int vinum_rqinfo(caddr_t data);
 void LongJmp(label_t *);
-char *basename(char *);
 #else
 void longjmp(label_t *);                                   /* the kernel doesn't define this */
 #endif
 
+char *basename(char *);
 typedef int cmp_t __P((const void *, const void *));
 void qsort(void *a, size_t n, size_t es, cmp_t * cmp);
 void expand_table(void **, int, int);
@@ -249,10 +248,13 @@
 void FFree(void *mem, char *, int);
 #define LOCKDRIVE(d) lockdrive (d, __FILE__, __LINE__)
 #else
+/* kernel, no debug */
+#define Malloc(x)  malloc ((x), M_DEVBUF, M_NOWAIT)
 #define Free(x)    free((x), M_DEVBUF)
 #define LOCKDRIVE(d) lockdrive (d)
 #endif
 #else
+/* not kernel */
 #define Malloc(x)  malloc ((x))                                    /* just the size */
 #define Free(x)           free ((x))                               /* just the address */
 #endif