summaryrefslogtreecommitdiffstats
path: root/lib/zassert.h
diff options
context:
space:
mode:
authorChris Hall <GMCH@hestia.halldom.com>2010-01-10 23:38:14 +0000
committerChris Hall <GMCH@hestia.halldom.com>2010-01-10 23:38:14 +0000
commit5ef5e27f2418316855e388ec8f6b87cdf140bd04 (patch)
treef42f39f1047a85b4f880b80ca2655b7eb665021d /lib/zassert.h
parent020867eda32194967de7ab6f1c1128147a9ed0a9 (diff)
downloadquagga-5ef5e27f2418316855e388ec8f6b87cdf140bd04.tar.bz2
quagga-5ef5e27f2418316855e388ec8f6b87cdf140bd04.tar.xz
Further work-in-progress
modified: .gitignore modified: bgpd/Makefile.am modified: bgpd/bgp.h modified: bgpd/bgp_common.h modified: bgpd/bgp_connection.c modified: bgpd/bgp_connection.h modified: bgpd/bgp_fsm.c modified: bgpd/bgp_msg_write.c modified: bgpd/bgp_msg_write.h modified: bgpd/bgp_notification.c modified: bgpd/bgp_notification.h modified: bgpd/bgp_open_state.c modified: bgpd/bgp_open_state.h modified: bgpd/bgp_packet.h new file: bgpd/bgp_route_refresh.c new file: bgpd/bgp_route_refresh.h modified: bgpd/bgp_session.c modified: bgpd/bgp_session.h modified: lib/Makefile.am new file: lib/confirm.h modified: lib/memtypes.c modified: lib/stream.c modified: lib/stream.h modified: lib/zassert.h
Diffstat (limited to 'lib/zassert.h')
-rw-r--r--lib/zassert.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/lib/zassert.h b/lib/zassert.h
index 424688b9..a766eb7b 100644
--- a/lib/zassert.h
+++ b/lib/zassert.h
@@ -5,6 +5,8 @@
#ifndef _QUAGGA_ASSERT_H
#define _QUAGGA_ASSERT_H
+#include "confirm.h"
+
extern void _zlog_assert_failed (const char *assertion, const char *file,
unsigned int line, const char *function)
__attribute__ ((noreturn));
@@ -61,17 +63,4 @@ extern void _zlog_abort_err (const char *mess, int err, const char *file,
#define zabort_err(MS, ERR) _zlog_abort_err(MS, ERR, __FILE__, __LINE__, \
__ASSERT_FUNCTION)
-/*==============================================================================
- * Compile time CONFIRM gizmo
- *
- * Two forms: CONFIRM(e) for use at top (file) level
- * confirm(e) for use inside compound statements
- */
-#ifndef CONFIRM
-
- #define CONFIRM(e) extern void CONFIRMATION(char CONFIRM[(e) ? 1 : -1]) ;
- #define confirm(e) { CONFIRM(e) }
-
-#endif
-
#endif /* _QUAGGA_ASSERT_H */