X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fstrerror_r.m4;h=6cf46240a7912f5386a488ed9ec1d0fbda10f770;hb=c27f394b70a4af807ab515fa92cc764fd2e64d4b;hp=eab6916fae219a18f69b47ad0af26657b6331440;hpb=6b397a2132acf9901b4b9b9b5ee6b3b02aaeba73;p=gnulib.git

diff --git a/m4/strerror_r.m4 b/m4/strerror_r.m4
index eab6916fa..6cf46240a 100644
--- a/m4/strerror_r.m4
+++ b/m4/strerror_r.m4
@@ -1,4 +1,4 @@
-#serial 1000
+#serial 1002
 # Experimental replacement for the function in the latest CVS autoconf.
 # If the compile-test says strerror_r doesn't work, then resort to a
 # `run'-test that works on BeOS and segfaults on DEC Unix.
@@ -9,8 +9,7 @@ undefine([AC_FUNC_STRERROR_R])
 # AC_FUNC_STRERROR_R
 # ------------------
 AC_DEFUN([AC_FUNC_STRERROR_R],
-[# Check strerror_r
-AC_CHECK_DECLS([strerror_r])
+[AC_CHECK_DECLS([strerror_r])
 AC_CHECK_FUNCS([strerror_r])
 if test $ac_cv_func_strerror_r = yes; then
   AC_CHECK_HEADERS(string.h)
@@ -25,8 +24,8 @@ if test $ac_cv_func_strerror_r = yes; then
 #       endif
      ],
      [
-       char buf;
-       char x = *strerror_r (0, &buf, sizeof buf);
+       char buf[100];
+       char x = *strerror_r (0, buf, sizeof buf);
      ],
      ac_cv_func_strerror_r_works=yes,
      ac_cv_func_strerror_r_works=no
@@ -42,26 +41,26 @@ if test $ac_cv_func_strerror_r = yes; then
        [
 #       include <stdio.h>
 #       include <string.h>
+#       include <ctype.h>
 
 	extern char *strerror_r ();
 
 	int
 	main ()
 	{
-	  char buf[2];
+	  char buf[100];
 	  char x = *strerror_r (0, buf, sizeof buf);
-	  exit (x && !isalpha (x));
+	  exit (!isalpha (x));
 	}
        ],
        ac_cv_func_strerror_r_works=yes,
        ac_cv_func_strerror_r_works=no,
        ac_cv_func_strerror_r_works=no)
     fi
-
-    if test $ac_cv_func_strerror_r_works = yes; then
-      AC_DEFINE_UNQUOTED(HAVE_WORKING_STRERROR_R, 1,
-        [Define to 1 if `strerror_r' returns a string.])
-    fi
   ])
+  if test $ac_cv_func_strerror_r_works = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_WORKING_STRERROR_R, 1,
+      [Define to 1 if `strerror_r' returns a string.])
+  fi
 fi
 ])# AC_FUNC_STRERROR_R