Print this page
3853 __cplusplus change and headers incompatipility with clang
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/head/malloc.h
+++ new/usr/src/head/malloc.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
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]
|
↓ open down ↓ |
18 lines elided |
↑ open up ↑ |
19 19 *
20 20 * CDDL HEADER END
21 21 */
22 22 /* Copyright (c) 1988 AT&T */
23 23 /* All Rights Reserved */
24 24
25 25
26 26 #ifndef _MALLOC_H
27 27 #define _MALLOC_H
28 28
29 -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.7 */
30 -
31 29 #include <sys/types.h>
32 30
33 31 #ifdef __cplusplus
34 32 extern "C" {
35 33 #endif
36 34
37 35 /*
38 36 * Constants defining mallopt operations
39 37 */
40 38 #define M_MXFAST 1 /* set size of blocks to be fast */
41 39 #define M_NLBLKS 2 /* set number of block in a holding block */
42 40 #define M_GRAIN 3 /* set number of sizes mapped to one, for */
43 41 /* small blocks */
44 42 #define M_KEEP 4 /* retain contents of block after a free */
45 43 /* until another allocation */
46 44 /*
47 45 * structure filled by
48 46 */
49 47 struct mallinfo {
50 48 unsigned long arena; /* total space in arena */
51 49 unsigned long ordblks; /* number of ordinary blocks */
52 50 unsigned long smblks; /* number of small blocks */
53 51 unsigned long hblks; /* number of holding blocks */
|
↓ open down ↓ |
13 lines elided |
↑ open up ↑ |
54 52 unsigned long hblkhd; /* space in holding block headers */
55 53 unsigned long usmblks; /* space in small blocks in use */
56 54 unsigned long fsmblks; /* space in free small blocks */
57 55 unsigned long uordblks; /* space in ordinary blocks in use */
58 56 unsigned long fordblks; /* space in free ordinary blocks */
59 57 unsigned long keepcost; /* cost of enabling keep option */
60 58 };
61 59
62 60 #if defined(__STDC__)
63 61
62 +#if (!defined(_STRICT_STDC) && !defined(_XOPEN_OR_POSIX)) || \
63 + defined(_XPG3)
64 +#if __cplusplus >= 199711L
65 +namespace std {
66 +#endif
67 +
64 68 void *malloc(size_t);
65 69 void free(void *);
66 70 void *realloc(void *, size_t);
71 +void *calloc(size_t, size_t);
72 +
73 +#if __cplusplus >= 199711L
74 +} /* end of namespace std */
75 +
76 +using std::malloc;
77 +using std::free;
78 +using std::realloc;
79 +using std::calloc;
80 +#endif /* __cplusplus >= 199711L */
81 +#endif /* (!defined(_STRICT_STDC) && !defined(_XOPEN_OR_POSIX)) || ... */
82 +
67 83 int mallopt(int, int);
68 84 struct mallinfo mallinfo(void);
69 -void *calloc(size_t, size_t);
70 85
71 86 #else
72 87
73 88 void *malloc();
74 89 void free();
75 90 void *realloc();
91 +void *calloc();
76 92 int mallopt();
77 93 struct mallinfo mallinfo();
78 -void *calloc();
79 94
80 95 #endif /* __STDC__ */
81 96
82 97 #ifdef __cplusplus
83 98 }
84 99 #endif
85 100
86 101 #endif /* _MALLOC_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX