X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu16-mbtouc-aux.c;h=e8e9c92d5c8621bed82615e1b3be279715328285;hb=4fe68d4176b4f0da64660bb9ce0f5412a6bb24de;hp=e056fc0cf999d05e76d94cdc65ed1f08abca358d;hpb=ac5cf7982cea8a4bb17680b6b9925f301cfa4220;p=gnulib.git

diff --git a/lib/unistr/u16-mbtouc-aux.c b/lib/unistr/u16-mbtouc-aux.c
index e056fc0cf..e8e9c92d5 100644
--- a/lib/unistr/u16-mbtouc-aux.c
+++ b/lib/unistr/u16-mbtouc-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UTF-16 to UCS-4.
-   Copyright (C) 2001-2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2006-2007, 2009-2011 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
@@ -20,7 +20,7 @@
 /* Specification.  */
 #include "unistr.h"
 
-#if HAVE_INLINE
+#if defined IN_LIBUNISTRING || HAVE_INLINE
 
 int
 u16_mbtouc_aux (ucs4_t *puc, const uint16_t *s, size_t n)
@@ -30,18 +30,18 @@ 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 */
-	}
+        {
+          if (s[1] >= 0xdc00 && s[1] < 0xe000)
+            {
+              *puc = 0x10000 + ((c - 0xd800) << 10) + (s[1] - 0xdc00);
+              return 2;
+            }
+          /* invalid multibyte character */
+        }
       else
-	{
-	  /* incomplete multibyte character */
-	}
+        {
+          /* incomplete multibyte character */
+        }
     }
   /* invalid multibyte character */
   *puc = 0xfffd;