Libc-320.1.3.tar.gz

[apple/libc.git] / include / runetype.h

diff --git a/include/runetype.h b/include/runetype.h
index 84ce83fd81f13b991fd02a5d4693436e69fc64bc..2aedf2fcb143af87c4c0ad697f52aae77395b8c0 100644 (file)
--- a/include/runetype.h
+++ b/include/runetype.h
@@ -1,3 +1,25 @@
+/*
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ * 
+ * @APPLE_LICENSE_HEADER_END@
+ */
 /*-
  * Copyright (c) 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -42,19 +64,35 @@
 #include <sys/cdefs.h>
 #include <machine/ansi.h>
 
-#ifndef        _BSD_RUNE_T_DEFINED_
-#define _BSD_RUNE_T_DEFINED_
-typedef        _BSD_RUNE_T_    rune_t;
-#endif
-
 #ifndef        _BSD_SIZE_T_DEFINED_
 #define _BSD_SIZE_T_DEFINED_
 typedef        _BSD_SIZE_T_    size_t;
 #endif
 
+#ifndef        _BSD_CT_RUNE_T_DEFINED_
+#define _BSD_CT_RUNE_T_DEFINED_
+typedef        _BSD_CT_RUNE_T_ ct_rune_t;
+#endif
+
+#ifndef        _BSD_RUNE_T_DEFINED_
+#define _BSD_RUNE_T_DEFINED_
+typedef        _BSD_RUNE_T_    rune_t;
+#endif
+
+#ifndef        __cplusplus
 #ifndef        _BSD_WCHAR_T_DEFINED_
-#define _BSD_WCHAR_T_DEFINED_
+#define        _BSD_WCHAR_T_DEFINED_
+#ifdef __WCHAR_TYPE__
+typedef        __WCHAR_TYPE__  wchar_t;
+#else  /* ! __WCHAR_TYPE__ */
 typedef        _BSD_WCHAR_T_   wchar_t;
+#endif /* __WCHAR_TYPE__ */
+#endif /* _BSD_WCHAR_T_DEFINED_ */
+#endif /* __cplusplus */
+
+#ifndef        _BSD_WINT_T_DEFINED_
+#define _BSD_WINT_T_DEFINED_
+typedef        _BSD_WINT_T_    wint_t;
 #endif
 
 #define        _CACHED_RUNES   (1 <<8 )        /* Must be a power of 2 */
@@ -80,9 +118,9 @@ typedef struct {
        char            encoding[32];   /* ASCII name of this encoding */
 
        rune_t          (*sgetrune)
-           __P((const char *, size_t, char const **));
+          (const char *, size_t, char const **);
        int             (*sputrune)
-           __P((rune_t, char *, size_t, char **));
+          (rune_t, char *, size_t, char **);
        rune_t          invalid_rune;
 
        unsigned long   runetype[_CACHED_RUNES];
@@ -104,7 +142,9 @@ typedef struct {
 
 #define        _RUNE_MAGIC_1   "RuneMagi"      /* Indicates version 0 of RuneLocale */
 
+__BEGIN_DECLS
 extern _RuneLocale _DefaultRuneLocale;
 extern _RuneLocale *_CurrentRuneLocale;
+__END_DECLS
 
 #endif /* !_RUNETYPE_H_ */