X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Funistr%2Fu16-uctomb.c;h=93310e01b2a03f389c56ec5b125585cb0e336c2d;hb=d462d9f08cc8fd534ccae14c878f9c7c18112237;hp=88a4c21d513eb2cfc4e60ad45573bad7251ae481;hpb=ac5cf7982cea8a4bb17680b6b9925f301cfa4220;p=gnulib.git

diff --git a/lib/unistr/u16-uctomb.c b/lib/unistr/u16-uctomb.c
index 88a4c21d5..93310e01b 100644
--- a/lib/unistr/u16-uctomb.c
+++ b/lib/unistr/u16-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-16 string.
-   Copyright (C) 2002, 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
@@ -17,6 +17,11 @@
 
 #include <config.h>
 
+#if defined IN_LIBUNISTRING
+/* Tell unistr.h to declare u16_uctomb as 'extern', not 'static inline'.  */
+# include "unistring-notinline.h"
+#endif
+
 /* Specification.  */
 #include "unistr.h"
 
@@ -28,38 +33,38 @@ u16_uctomb (uint16_t *s, ucs4_t uc, int n)
   if (uc < 0xd800)
     {
       if (n > 0)
-	{
-	  s[0] = uc;
-	  return 1;
-	}
+        {
+          s[0] = uc;
+          return 1;
+        }
       /* else return -2, below.  */
     }
   else if (uc < 0x10000)
     {
       if (uc >= 0xe000)
-	{
-	  if (n >= 1)
-	    {
-	      s[0] = uc;
-	      return 1;
-	    }
-	}
+        {
+          if (n >= 1)
+            {
+              s[0] = uc;
+              return 1;
+            }
+        }
       else
-	return -1;
+        return -1;
     }
   else
     {
       if (uc < 0x110000)
-	{
-	  if (n >= 2)
-	    {
-	      s[0] = 0xd800 + ((uc - 0x10000) >> 10);
-	      s[1] = 0xdc00 + ((uc - 0x10000) & 0x3ff);
-	      return 2;
-	    }
-	}
+        {
+          if (n >= 2)
+            {
+              s[0] = 0xd800 + ((uc - 0x10000) >> 10);
+              s[1] = 0xdc00 + ((uc - 0x10000) & 0x3ff);
+              return 2;
+            }
+        }
       else
-	return -1;
+        return -1;
     }
   return -2;
 }