Libc-498.tar.gz

[apple/libc.git] / locale / FreeBSD / collate.h.patch

diff --git a/locale/FreeBSD/collate.h.patch b/locale/FreeBSD/collate.h.patch
index f68f99cef9035b0ba29cde4e9d89d2f0970aab23..cbdb83f7d689492082f835f61accb1e4dd083559 100644 (file)
--- a/locale/FreeBSD/collate.h.patch
+++ b/locale/FreeBSD/collate.h.patch
@@ -1,6 +1,6 @@
 --- collate.h.orig     2003-05-20 15:21:44.000000000 -0700
-+++ collate.h  2005-02-19 14:36:36.000000000 -0800
-@@ -31,7 +31,9 @@
++++ collate.h  2005-10-20 00:05:25.000000000 -0700
+@@ -31,36 +31,88 @@
  #define       _COLLATE_H_
  
  #include <sys/cdefs.h>
@@ -10,24 +10,69 @@
  #include <limits.h>
  
  #define STR_LEN 10
-@@ -43,24 +45,32 @@
-       int prim, sec;
+ #define TABLE_SIZE 100
+ #define COLLATE_VERSION    "1.0\n"
+ #define COLLATE_VERSION1_1 "1.1\n"
++#define COLLATE_VERSION1_1A "1.1A\n"
++/* see discussion in string/FreeBSD/strxfrm for this value */
++#define COLLATE_MAX_PRIORITY ((1 << 24) - 1)
++
++#define DIRECTIVE_UNDEF 0x00
++#define DIRECTIVE_FORWARD 0x01
++#define DIRECTIVE_BACKWARD 0x02
++#define DIRECTIVE_POSITION 0x04
++
++#define DIRECTIVE_DIRECTION_MASK (DIRECTIVE_FORWARD | DIRECTIVE_BACKWARD)
++
++#define COLLATE_SUBST_DUP 0x0001
++
++#define IGNORE_EQUIV_CLASS 1
++
++struct __collate_st_info {
++      __uint8_t directive[COLL_WEIGHTS_MAX];
++      __uint8_t flags;
++#if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN
++      __uint8_t directive_count:4;
++      __uint8_t chain_max_len:4;
++#else
++      __uint8_t chain_max_len:4;
++      __uint8_t directive_count:4;
++#endif
++      __int32_t undef_pri[COLL_WEIGHTS_MAX];
++      __int32_t subst_count[COLL_WEIGHTS_MAX];
++      __int32_t chain_count;
++      __int32_t large_pri_count;
++};
+ 
+ struct __collate_st_char_pri {
+-      int prim, sec;
++      __int32_t pri[COLL_WEIGHTS_MAX];
  };
  struct __collate_st_chain_pri {
 -      u_char str[STR_LEN];
-+      unsigned char str[STR_LEN];
-       int prim, sec;
+-      int prim, sec;
++      __darwin_wchar_t str[STR_LEN];
++      __int32_t pri[COLL_WEIGHTS_MAX];
++};
++struct __collate_st_large_char_pri {
++      __int32_t val;
++      struct __collate_st_char_pri pri;
++};
++struct __collate_st_subst {
++      __int32_t val;
++      __darwin_wchar_t str[STR_LEN];
  };
  
 +#ifndef __LIBC__
  extern int __collate_load_error;
  extern int __collate_substitute_nontrivial;
- #define __collate_substitute_table (*__collate_substitute_table_ptr)
+-#define __collate_substitute_table (*__collate_substitute_table_ptr)
 -extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
-+extern unsigned char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
  #define __collate_char_pri_table (*__collate_char_pri_table_ptr)
  extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
  extern struct __collate_st_chain_pri *__collate_chain_pri_table;
++extern __int32_t *__collate_chain_equiv_table;
++extern struct __collate_st_info __collate_info;
 +#endif /* !__LIBC__ */
  
  __BEGIN_DECLS
@@ -35,16 +80,21 @@
 -u_char        *__collate_substitute(const u_char *);
 -int   __collate_load_tables(const char *);
 -void  __collate_lookup(const u_char *, int *, int *, int *);
-+unsigned char *__collate_strdup(unsigned char *);
+-int   __collate_range_cmp(int, int);
 +#ifdef __LIBC__
-+unsigned char *__collate_substitute_l(const unsigned char *, locale_t);
++__darwin_wchar_t      *__collate_mbstowcs(const char *, locale_t);
++__darwin_wchar_t      *__collate_wcsdup(const __darwin_wchar_t *);
++__darwin_wchar_t      *__collate_substitute(const __darwin_wchar_t *, int, locale_t);
 +int   __collate_load_tables(const char *, locale_t);
-+void  __collate_lookup_l(const unsigned char *, int *, int *, int *, locale_t);
-+int   __collate_range_cmp(int, int, locale_t);
++void  __collate_lookup_l(const __darwin_wchar_t *, int *, int *, int *, locale_t);
++void  __collate_lookup_which(const __darwin_wchar_t *, int *, int *, int, locale_t);
++void  __collate_xfrm(const __darwin_wchar_t *, __darwin_wchar_t **, locale_t);
++int   __collate_range_cmp(__darwin_wchar_t, __darwin_wchar_t, locale_t);
++size_t        __collate_collating_symbol(__darwin_wchar_t *, size_t, const char *, size_t, __darwin_mbstate_t *, locale_t);
++int   __collate_equiv_class(const char *, size_t, __darwin_mbstate_t *, locale_t);
++size_t        __collate_equiv_match(int, __darwin_wchar_t *, size_t, __darwin_wchar_t, const char *, size_t, __darwin_mbstate_t *, size_t *, locale_t);
 +#else /* !__LIBC__ */
-+unsigned char *__collate_substitute(const unsigned char *);
 +void  __collate_lookup(const unsigned char *, int *, int *, int *);
- int   __collate_range_cmp(int, int);
 +#endif /* __LIBC__ */
  #ifdef COLLATE_DEBUG
  void  __collate_print_tables(void);