Print this page
remove support for non-ANSI compilation
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/head/assert.h
+++ new/usr/src/head/assert.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License, Version 1.0 only
6 6 * (the "License"). You may not use this file except in compliance
7 7 * with the License.
8 8 *
9 9 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 * or http://www.opensolaris.org/os/licensing.
11 11 * See the License for the specific language governing permissions
12 12 * and limitations under the License.
13 13 *
14 14 * When distributing Covered Code, include this CDDL HEADER in each
↓ open down ↓ |
14 lines elided |
↑ open up ↑ |
15 15 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16 16 * If applicable, add the following below this CDDL HEADER, with the
17 17 * fields enclosed by brackets "[]" replaced with your own identifying
18 18 * information: Portions Copyright [yyyy] [name of copyright owner]
19 19 *
20 20 * CDDL HEADER END
21 21 */
22 22 /* Copyright (c) 1988 AT&T */
23 23 /* All Rights Reserved */
24 24
25 -
26 25 /*
26 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
27 + *
27 28 * Copyright 2004 Sun Microsystems, Inc. All rights reserved.
28 29 * Use is subject to license terms.
29 30 */
30 31
31 32 #ifndef _ASSERT_H
32 33 #define _ASSERT_H
33 34
34 -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6.1.4 */
35 -
36 35 #ifdef __cplusplus
37 36 extern "C" {
38 37 #endif
39 38
40 -#if defined(__STDC__)
41 39 #if __STDC_VERSION__ - 0 >= 199901L
42 40 extern void __assert_c99(const char *, const char *, int, const char *);
43 41 #else
44 42 extern void __assert(const char *, const char *, int);
45 43 #endif /* __STDC_VERSION__ - 0 >= 199901L */
46 -#else
47 -extern void _assert();
48 -#endif
49 44
50 45 #ifdef __cplusplus
51 46 }
52 47 #endif
53 48
54 49 #endif /* _ASSERT_H */
55 50
56 51 /*
57 52 * Note that the ANSI C Standard requires all headers to be idempotent except
58 53 * <assert.h> which is explicitly required not to be idempotent (section 4.1.2).
59 54 * Therefore, it is by intent that the header guards (#ifndef _ASSERT_H) do
60 55 * not span this entire file.
↓ open down ↓ |
2 lines elided |
↑ open up ↑ |
61 56 */
62 57
63 58 #undef assert
64 59
65 60 #ifdef NDEBUG
66 61
67 62 #define assert(EX) ((void)0)
68 63
69 64 #else
70 65
71 -#if defined(__STDC__)
72 66 #if __STDC_VERSION__ - 0 >= 199901L
73 67 #define assert(EX) (void)((EX) || \
74 68 (__assert_c99(#EX, __FILE__, __LINE__, __func__), 0))
75 69 #else
76 70 #define assert(EX) (void)((EX) || (__assert(#EX, __FILE__, __LINE__), 0))
77 71 #endif /* __STDC_VERSION__ - 0 >= 199901L */
78 -#else
79 -#define assert(EX) (void)((EX) || (_assert("EX", __FILE__, __LINE__), 0))
80 -#endif /* __STDC__ */
81 72
82 73 #endif /* NDEBUG */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX