Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename __assert() to __kernassert() so that it doesn't collide

Browse Source 
with the libc version.  They take different arguments.
This commit is contained in:
pooka 2007-09-24 14:19:03 +00:00
parent 44a18be646
commit 018bb97124
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/lib/libkern/__assert.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __assert.c,v 1.10 2007/08/03 13:06:00 ad Exp $ */
/* $NetBSD: __assert.c,v 1.11 2007/09/24 14:19:03 pooka Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@ -39,7 +39,7 @@
#endif
void
__assert(const char *t, const char *f, int l, const char *e)
__kernassert(const char *t, const char *f, int l, const char *e)
{
#ifdef _KERNEL

16
sys/lib/libkern/libkern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: libkern.h,v 1.70 2007/07/29 11:46:02 ad Exp $ */
/* $NetBSD: libkern.h,v 1.71 2007/09/24 14:19:03 pooka Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -179,10 +179,10 @@ tolower(int ch)
#else
#ifdef __STDC__
#define assert(e) (__predict_true((e)) ? (void)0 : \
__assert("", __FILE__, __LINE__, #e))
__kernassert("", __FILE__, __LINE__, #e))
#else
#define assert(e) (__predict_true((e)) ? (void)0 : \
__assert("", __FILE__, __LINE__, "e"))
__kernassert("", __FILE__, __LINE__, "e"))
#endif
#endif
@ -203,10 +203,10 @@ tolower(int ch)
#define _DIAGASSERT(a) assert(a)
#ifdef __STDC__
#define KASSERT(e) (__predict_true((e)) ? (void)0 : \
__assert("diagnostic ", __FILE__, __LINE__, #e))
__kernassert("diagnostic ", __FILE__, __LINE__, #e))
#else
#define KASSERT(e) (__predict_true((e)) ? (void)0 : \
__assert("diagnostic ", __FILE__, __LINE__, "e"))
__kernassert("diagnostic ", __FILE__, __LINE__,"e"))
#endif
#endif
@ -219,10 +219,10 @@ tolower(int ch)
#else
#ifdef __STDC__
#define KDASSERT(e) (__predict_true((e)) ? (void)0 : \
__assert("debugging ", __FILE__, __LINE__, #e))
__kernassert("debugging ", __FILE__, __LINE__, #e))
#else
#define KDASSERT(e) (__predict_true((e)) ? (void)0 : \
__assert("debugging ", __FILE__, __LINE__, "e"))
__kernassert("debugging ", __FILE__, __LINE__, "e"))
#endif
#endif
/*
@ -285,7 +285,7 @@ int ffs __P((int));
#define ffs(x) __builtin_ffs(x)
#endif
void __assert __P((const char *, const char *, int, const char *));
void __kernassert __P((const char *, const char *, int, const char *));
unsigned int
bcdtobin __P((unsigned int));
unsigned int