xnu-517.tar.gz

[apple/xnu.git] / bsd / sys / utfconv.h

diff --git a/bsd/sys/utfconv.h b/bsd/sys/utfconv.h
index f3f2bfaccd3eda614f0706a11a6854d2037b938b..57f7725c4b8d280c63953191806c830d525cb076 100644 (file)
--- a/bsd/sys/utfconv.h
+++ b/bsd/sys/utfconv.h
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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@
  */
@@ -23,13 +26,18 @@
 #ifndef _SYS_UTFCONV_H_
 #define        _SYS_UTFCONV_H_
 
+#include <sys/appleapiopts.h>
+#include <sys/cdefs.h> 
+
 #ifdef KERNEL
+#ifdef __APPLE_API_UNSTABLE
 /*
  * UTF-8 encode/decode flags
  */
 #define        UTF_REVERSE_ENDIAN      0x01    /* reverse UCS-2 byte order */
 #define UTF_NO_NULL_TERM       0x02    /* do not add null termination */
-#define        UTF_DECOMPOSED          0x04    /* generate fully decompsed UCS-2 */
+#define        UTF_DECOMPOSED          0x04    /* generate fully decomposed UCS-2 */
+#define        UTF_PRECOMPOSED         0x08    /* generate precomposed UCS-2 */
 
 __BEGIN_DECLS
 size_t utf8_encodelen __P((const u_int16_t *, size_t, u_int16_t, int));
@@ -41,6 +49,7 @@ int   utf8_decodestr __P((const u_int8_t *, size_t, u_int16_t *,size_t *,
                size_t, u_int16_t, int));
 __END_DECLS
 
+#endif /* __APPLE_API_UNSTABLE */
 #endif /* KERNEL */
 
 #endif /* !_SYS_UTFCONV_H_ */