Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/include DTrace: remove assert.h - should...



details:   https://anonhg.NetBSD.org/src/rev/1fce58384685
branches:  trunk
changeset: 752259:1fce58384685
user:      darran <darran%NetBSD.org@localhost>
date:      Sun Feb 21 09:52:08 2010 +0000

description:
DTrace: remove assert.h - shouldn't have been checked in (breaks libdtrace
build).

diffstat:

 external/cddl/osnet/include/assert.h |  57 ------------------------------------
 1 files changed, 0 insertions(+), 57 deletions(-)

diffs (61 lines):

diff -r ec74b97803f2 -r 1fce58384685 external/cddl/osnet/include/assert.h
--- a/external/cddl/osnet/include/assert.h      Sun Feb 21 09:02:19 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*     $NetBSD: assert.h,v 1.2 2010/02/21 01:46:34 darran Exp $        */
-
-/*-
- * Copyright (c) 2009 Pawel Jakub Dawidek <pjd%FreeBSD.org@localhost>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * $FreeBSD: src/cddl/compat/opensolaris/include/assert.h,v 1.1.2.2 2009/09/15 11:13:40 pjd Exp $
- */
-
-#undef assert
-#undef _assert
-
-#ifdef NDEBUG
-#define        assert(e)       ((void)0)
-#define        _assert(e)      ((void)0)
-#else
-#define        _assert(e)      assert(e)
-
-#define        assert(e)       ((e) ? (void)0 : __assert(#e, __FILE__, __LINE__))
-#endif /* NDEBUG */
-
-#ifndef _ASSERT_H_
-#define _ASSERT_H_
-#include <stdio.h>
-#include <stdlib.h>
-
-static __inline void
-__assert(const char *expr, const char *file, int line)
-{
-
-       (void)fprintf(stderr, "Assertion failed: (%s), file %s, line %d.\n",
-           expr, file, line);
-       abort();
-       /* NOTREACHED */
-}
-#endif /* !_ASSERT_H_ */



Home | Main Index | Thread Index | Old Index