Print this page
remove support for non-ANSI compilation
Split |
Close |
Expand all |
Collapse all |
--- old/usr/src/head/iconv.h
+++ new/usr/src/head/iconv.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.
↓ open down ↓ |
12 lines elided |
↑ open up ↑ |
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]
19 19 *
20 20 * CDDL HEADER END
21 21 */
22 22 /*
23 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
24 + *
23 25 * Copyright 2003 Sun Microsystems, Inc. All rights reserved.
24 26 * Use is subject to license terms.
25 27 */
26 28
27 29 #ifndef _ICONV_H
28 30 #define _ICONV_H
29 31
30 -#pragma ident "%Z%%M% %I% %E% SMI"
31 -
32 32 #include <sys/feature_tests.h>
33 33 #include <sys/types.h>
34 34
35 35 #ifdef __cplusplus
36 36 extern "C" {
37 37 #endif
38 38
39 39 typedef struct _iconv_info *iconv_t;
40 40
41 -#if defined(__STDC__)
42 41 extern iconv_t iconv_open(const char *, const char *);
43 42 #ifdef _XPG6
44 43 extern size_t iconv(iconv_t, char **_RESTRICT_KYWD,
45 44 size_t *_RESTRICT_KYWD, char **_RESTRICT_KYWD,
46 45 size_t *_RESTRICT_KYWD);
47 46 #else
48 47 extern size_t iconv(iconv_t, const char **_RESTRICT_KYWD,
49 48 size_t *_RESTRICT_KYWD, char **_RESTRICT_KYWD,
50 49 size_t *_RESTRICT_KYWD);
51 50 #endif
52 51 extern int iconv_close(iconv_t);
53 -#else /* __STDC__ */
54 -extern iconv_t iconv_open();
55 -extern size_t iconv();
56 -extern int iconv_close();
57 -#endif
58 52
59 53 #ifdef __cplusplus
60 54 }
61 55 #endif
62 56
63 57 #endif /* _ICONV_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX