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

diff --git a/lib/unistr/u16-uctomb-aux.c b/lib/unistr/u16-uctomb-aux.c
index 1ad86aa08..1cda3f3f7 100644
--- a/lib/unistr/u16-uctomb-aux.c
+++ b/lib/unistr/u16-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-16.
-   Copyright (C) 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 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
@@ -20,8 +20,6 @@
 /* Specification.  */
 #include "unistr.h"
 
-#if HAVE_INLINE
-
 int
 u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n)
 {
@@ -32,31 +30,29 @@ u16_uctomb_aux (uint16_t *s, ucs4_t uc, int n)
   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;
 }
-
-#endif