time: Undefine more broken macros.

[pspp] / lib / memcoll.c

diff --git a/lib/memcoll.c b/lib/memcoll.c
index e5ef36397b6a5af2b9361ff71fb42064c2e25947..e08ffa5469cd04fcb71797e13c9f2d8e63047cdc 100644 (file)
--- a/lib/memcoll.c
+++ b/lib/memcoll.c
@@ -1,11 +1,12 @@
 /* Locale-specific memory comparison.
 
-   Copyright (C) 1999, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2004, 2006, 2009-2010 Free Software Foundation,
+   Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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.
+   the Free Software Foundation; either version 3 of the License, 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
@@ -13,8 +14,7 @@
    GNU 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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Contributed by Paul Eggert <eggert@twinsun.com>.  */
 
@@ -55,29 +55,29 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
       s2[s2len++] = '\0';
 
       while (! (errno = 0, (diff = strcoll (s1, s2)) || errno))
-       {
-         /* strcoll found no difference, but perhaps it was fooled by NUL
-            characters in the data.  Work around this problem by advancing
-            past the NUL chars.  */
-         size_t size1 = strlen (s1) + 1;
-         size_t size2 = strlen (s2) + 1;
-         s1 += size1;
-         s2 += size2;
-         s1len -= size1;
-         s2len -= size2;
-
-         if (s1len == 0)
-           {
-             if (s2len != 0)
-               diff = -1;
-             break;
-           }
-         else if (s2len == 0)
-           {
-             diff = 1;
-             break;
-           }
-       }
+        {
+          /* strcoll found no difference, but perhaps it was fooled by NUL
+             characters in the data.  Work around this problem by advancing
+             past the NUL chars.  */
+          size_t size1 = strlen (s1) + 1;
+          size_t size2 = strlen (s2) + 1;
+          s1 += size1;
+          s2 += size2;
+          s1len -= size1;
+          s2len -= size2;
+
+          if (s1len == 0)
+            {
+              if (s2len != 0)
+                diff = -1;
+              break;
+            }
+          else if (s2len == 0)
+            {
+              diff = 1;
+              break;
+            }
+        }
 
       s1[s1len - 1] = n1;
       s2[s2len - 1] = n2;