strerror_r: Reorder #if blocks.

* lib/strerror_r.c (strerror_r): Reorder conditionals in the function
for consistency with the previous commit.

diff --git a/ChangeLog b/ChangeLog
index 8eaefefdd81f694696d459e1e847ca9c4f6c0486..db41064127447d876f7b60c1c07442d60f39b927 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-19  Bruno Haible  <bruno@clisp.org>
+
+       strerror_r: Reorder #if blocks.
+       * lib/strerror_r.c (strerror_r): Reorder conditionals in the function
+       for consistency with the previous commit.
+
 2011-05-19  Bruno Haible  <bruno@clisp.org>
 
        perror: Avoid clobbering the strerror buffer when possible.
@@ -13,7 +19,7 @@
 2011-05-19  Eric Blake  <eblake@redhat.com>
 
        strerror_r: fix on newer cygwin
-       * lib/strerror_r.c (rpl_strerror_r): Cygwin now has
+       * lib/strerror_r.c (strerror_r): Cygwin now has
        __xpg_strerror_r, use it.
 
 2011-05-19  Bruno Haible  <bruno@clisp.org>

diff --git a/lib/strerror_r.c b/lib/strerror_r.c
index fe1185ba4e06b03877ca86f8a331aa496e56b93a..db482451069ef5462ed21e4dc74f8373b3280e16 100644 (file)
--- a/lib/strerror_r.c
+++ b/lib/strerror_r.c
@@ -419,7 +419,17 @@ strerror_r (int errnum, char *buf, size_t buflen)
   {
     int ret;
 
-#if USE_SYSTEM_STRERROR_R
+#if USE_XPG_STRERROR_R
+
+    {
+      extern int __xpg_strerror_r (int errnum, char *buf, size_t buflen);
+
+      ret = __xpg_strerror_r (errnum, buf, buflen);
+      if (ret < 0)
+        ret = errno;
+    }
+
+#elif USE_SYSTEM_STRERROR_R
 
     if (buflen > INT_MAX)
       buflen = INT_MAX;
@@ -495,16 +505,6 @@ strerror_r (int errnum, char *buf, size_t buflen)
           }
       }
 
-#elif USE_XPG_STRERROR_R
-
-    {
-      extern int __xpg_strerror_r (int errnum, char *buf, size_t buflen);
-
-      ret = __xpg_strerror_r (errnum, buf, buflen);
-      if (ret < 0)
-        ret = errno;
-    }
-
 #else /* USE_SYSTEM_STRERROR */
 
     /* Try to do what strerror (errnum) does, but without clobbering the