$NetBSD: patch-ah,v 1.1.1.1 2009/11/24 11:46:01 obache Exp $ --- src/scim_types.h.in.orig 2008-11-02 06:42:37.000000000 +0000 +++ src/scim_types.h.in @@ -31,13 +31,7 @@ #define __SCIM_TYPES_H @INCLUDE_STDINT@ - -#ifdef __FreeBSD__ -# include -# if __FreeBSD_version > 500035 -# define __STDC_ISO_10646__ -# endif -#endif +#include namespace scim { @@ -51,6 +45,136 @@ typedef @UINT64@ uint64; typedef uint32 ucs4_t; #endif +} // namespace scim + +#ifndef __STDC_ISO_10646__ +#include + +namespace std +{ + +template<> +struct char_traits +{ + +typedef scim::ucs4_t char_type; +typedef scim::ucs4_t int_type; +typedef streampos pos_type; +typedef streamoff off_type; +typedef mbstate_t state_type; + +static void +assign(char_type& __c1, const char_type& __c2) +{ + __c1 = __c2; +} + +static bool +eq(const char_type& __c1, const char_type& __c2) +{ + return __c1 == __c2; +} + +static bool +lt(const char_type& __c1, const char_type& __c2) +{ + return __c1 < __c2; +} + +static char_type* +assign(char_type* __s, size_t __n, char_type __a) +{ + while (__n-- > 0) + assign(__s[__n], __a); + return __s; +} + +static char_type* +copy(char_type* __s1, const char_type* __s2, size_t __n) +{ + return static_cast + (memcpy(__s1, __s2, __n * sizeof(char_type))); +} + +static char_type* +move(char_type* __s1, const char_type* __s2, size_t __n) +{ + return static_cast + (memmove(__s1, __s2, __n * sizeof(char_type))); +} + +static size_t +length(const char_type* __s) +{ + const char_type *__p; + + __p = __s; + while (eq(*__p, static_cast(0))) + ++__p; + return static_cast(__p - __s); +} + +static int +compare(const char_type* __s1, const char_type* __s2, size_t __n) +{ + size_t __i; + + for (__i = 0; __i < __n; ++__i) + if (!eq(__s1[__i], __s2[__i])) + return lt(__s1[__i], __s2[__i]) ? -1 : 1; + return 0; +} + +static const char_type* +find(const char_type* __s, size_t __n, const char_type& __a) +{ + while (__n-- > 0) { + if (eq(*__s, __a)) + return __s; + ++__s; + } + return 0; +} + +static bool +eq_int_type(const int_type& __c1, const int_type& __c2) +{ + return __c1 == __c2; +} + +static char_type +to_char_type(const int_type& __c) +{ + return static_cast(__c); +} + +static int_type +to_int_type(const char_type& __c) +{ + return static_cast(__c); +} + +static int_type +eof() +{ + return static_cast(-1); +} + +static int_type +not_eof(const int_type& __c) +{ + return eq_int_type(__c, eof()) + ? static_cast(0) : __c; +} + +}; // struct char_traits + +} // namespace std + +#endif //!__STDC_ISO_10646__ + +namespace scim { + typedef std::basic_string String; typedef std::basic_string WideString;