diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 04:30:27 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-19 04:30:27 +0000 |
commit | 8e4d8ce5e5643ae5be3d077a03d0266cfa7a74b4 (patch) | |
tree | fa2284408ca7a7c151192b531ca9ef8a78fedff0 /serverboot/assert.h | |
parent | a0a2eed0f2f4b3f4a0a988b58f594adb8a1c24bf (diff) | |
parent | 93ba48b6534f44c41f5739505dc9943d760a1867 (diff) |
Merge remote-tracking branch 'mainline/master' into dde
Conflicts:
Makefile
boot/ChangeLog
boot/boot.c
configure
configure.in
doc/ChangeLog
libdiskfs/ChangeLog
libdiskfs/boot-start.c
libports/manage-multithread.c
libthreads/ChangeLog
libthreads/alpha/thread.c
pfinet/ChangeLog
pfinet/iioctl-ops.c
pfinet/linux-src/net/ipv6/addrconf.c
pfinet/linux-src/net/ipv6/icmpv6.c
utils/settrans.c
Diffstat (limited to 'serverboot/assert.h')
-rw-r--r-- | serverboot/assert.h | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/serverboot/assert.h b/serverboot/assert.h deleted file mode 100644 index 9f70aec3..00000000 --- a/serverboot/assert.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1991,1990,1989,1988,1987 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon - * the rights to redistribute these changes. - */ - -#ifndef _ASSERT_H_ -#define _ASSERT_H_ - -#ifdef ASSERTIONS -extern void Assert(); - -#define assert(ex) \ - do { \ - if (!(ex)) \ - Assert(__FILE__, __LINE__); \ - } while (0) - -#ifdef lint -#define assert_static(x) -#else /* lint */ -#define assert_static(x) assert(x) -#endif /* lint */ - -#else /* ASSERTIONS */ -#define assert(ex) -#define assert_static(ex) -#endif /* ASSERTIONS */ - -#endif /* _ASSERT_H_ */ |