Print this page
remove support for non-ANSI compilation
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/head/libintl.h
+++ new/usr/src/head/libintl.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 (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
|
↓ open down ↓ |
11 lines elided |
↑ open up ↑ |
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 + * Copyright 2014 Garrett D'Amore <garrett@damore.org>
23 + *
22 24 * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
23 25 * Use is subject to license terms.
24 26 */
25 27
26 28
27 29 #ifndef _LIBINTL_H
28 30 #define _LIBINTL_H
29 31
30 -#pragma ident "%Z%%M% %I% %E% SMI"
31 -
32 32 #include <sys/isa_defs.h>
33 33
34 34 #ifdef __cplusplus
35 35 extern "C" {
36 36 #endif
37 37
38 38 /*
39 39 * wchar_t is a built-in type in standard C++ and as such is not
40 40 * defined here when using standard C++. However, the GNU compiler
41 41 * fixincludes utility nonetheless creates its own version of this
42 42 * header for use by gcc and g++. In that version it adds a redundant
43 43 * guard for __cplusplus. To avoid the creation of a gcc/g++ specific
44 44 * header we need to include the following magic comment:
45 45 *
46 46 * we must use the C++ compiler's type
47 47 *
48 48 * The above comment should not be removed or changed until GNU
49 49 * gcc/fixinc/inclhack.def is updated to bypass this header.
50 50 */
51 51 #if !defined(__cplusplus) || (__cplusplus < 199711L && !defined(__GNUG__))
52 52 #ifndef _WCHAR_T
53 53 #define _WCHAR_T
54 54 #if defined(_LP64)
55 55 typedef int wchar_t;
56 56 #else
|
↓ open down ↓ |
15 lines elided |
↑ open up ↑ |
57 57 typedef long wchar_t;
58 58 #endif
59 59 #endif /* !_WCHAR_T */
60 60 #endif /* !defined(__cplusplus) ... */
61 61
62 62 #define TEXTDOMAINMAX 256
63 63
64 64 #define __GNU_GETTEXT_SUPPORTED_REVISION(m) \
65 65 ((((m) == 0) || ((m) == 1)) ? 1 : -1)
66 66
67 -#ifdef __STDC__
68 67 extern char *dcgettext(const char *, const char *, const int);
69 68 extern char *dgettext(const char *, const char *);
70 69 extern char *gettext(const char *);
71 70 extern char *textdomain(const char *);
72 71 extern char *bindtextdomain(const char *, const char *);
73 72
74 73 /*
75 74 * LI18NUX 2000 Globalization Specification Version 1.0
76 75 * with Amendment 2
77 76 */
78 77 extern char *dcngettext(const char *, const char *,
79 78 const char *, unsigned long int, int);
80 79 extern char *dngettext(const char *, const char *,
81 80 const char *, unsigned long int);
82 81 extern char *ngettext(const char *, const char *, unsigned long int);
83 82 extern char *bind_textdomain_codeset(const char *, const char *);
|
↓ open down ↓ |
6 lines elided |
↑ open up ↑ |
84 83
85 84 /* Word handling functions --- requires dynamic linking */
86 85 /* Warning: these are experimental and subject to change. */
87 86 extern int wdinit(void);
88 87 extern int wdchkind(wchar_t);
89 88 extern int wdbindf(wchar_t, wchar_t, int);
90 89 extern wchar_t *wddelim(wchar_t, wchar_t, int);
91 90 extern wchar_t mcfiller(void);
92 91 extern int mcwrap(void);
93 92
94 -#else
95 -extern char *dcgettext();
96 -extern char *dgettext();
97 -extern char *gettext();
98 -extern char *textdomain();
99 -extern char *bindtextdomain();
100 -
101 -/*
102 - * LI18NUX 2000 Globalization Specification Version 1.0
103 - * with Amendment 2
104 - */
105 -extern char *dcngettext();
106 -extern char *dngettext();
107 -extern char *ngettext();
108 -extern char *bind_textdomain_codeset();
109 -
110 -/* Word handling functions --- requires dynamic linking */
111 -/* Warning: these are experimental and subject to change. */
112 -extern int wdinit();
113 -extern int wdchkind();
114 -extern int wdbindf();
115 -extern wchar_t *wddelim();
116 -extern wchar_t mcfiller();
117 -extern int mcwrap();
118 -
119 -#endif
120 -
121 93 #ifdef __cplusplus
122 94 }
123 95 #endif
124 96
125 97 #endif /* _LIBINTL_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX