X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Futf16-ucs4.h;h=37e289d0dd306932b4191db48563f29cc82eae0b;hb=0d0706a5f5e05d18ab61e7f19ca407452db68a31;hp=e182c28dae92bf55e9e4dbb4f81d25ebc3942975;hpb=b063d68090f35feeadd0ee28d0109caa89625df0;p=gnulib.git

diff --git a/lib/utf16-ucs4.h b/lib/utf16-ucs4.h
index e182c28da..37e289d0d 100644
--- a/lib/utf16-ucs4.h
+++ b/lib/utf16-ucs4.h
@@ -1,57 +1,37 @@
 /* Conversion UTF-16 to UCS-4.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
-   Written by Bruno Haible <haible@clisp.cons.org>, 2001.
+   Copyright (C) 2001-2002, 2005-2007 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2001.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
 
+#ifndef _UTF16_UCS4_H
+#define _UTF16_UCS4_H
 
 #include <stddef.h>
+#include "unitypes.h"
 
-/* Return the length (number of units) of the first character in S, putting
-   its 'ucs4_t' representation in *PUC.  */
-static int
-u16_mbtouc_aux (unsigned int *puc, const unsigned short *s, size_t n)
-{
-  unsigned short c = *s;
+extern int u16_mbtouc_aux (ucs4_t *puc, const uint16_t *s, size_t n);
 
-  if (c < 0xdc00)
-    {
-      if (n >= 2)
-        {
-          if (s[1] >= 0xdc00 && s[1] < 0xe000)
-            {
-              *puc = 0x10000 + ((c - 0xd800) << 10) + (s[1] - 0xdc00);
-              return 2;
-            }
-          /* invalid multibyte character */
-        }
-      else
-        {
-          /* incomplete multibyte character */
-          *puc = 0xfffd;
-          return n;
-        }
-    }
-  /* invalid multibyte character */
-  *puc = 0xfffd;
-  return 1;
-}
+/* Return the length (number of units) of the first character in S, putting
+   its 'ucs4_t' representation in *PUC.
+   The number of available units, N, must be > 0.  */
 static inline int
-u16_mbtouc (unsigned int *puc, const unsigned short *s, size_t n)
+u16_mbtouc (ucs4_t *puc, const uint16_t *s, size_t n)
 {
-  unsigned short c = *s;
+  uint16_t c = *s;
 
   if (c < 0xd800 || c >= 0xe000)
     {
@@ -61,3 +41,5 @@ u16_mbtouc (unsigned int *puc, const unsigned short *s, size_t n)
   else
     return u16_mbtouc_aux (puc, s, n);
 }
+
+#endif /* _UTF16_UCS4_H */