[mpich2-commits] r6657 - in mpich2/trunk: . src/util/mem

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2010-05-17 10:52:56 -0500 (Mon, 17 May 2010)
New Revision: 6657

Modified:
   mpich2/trunk/configure.in
   mpich2/trunk/src/util/mem/strerror.c
Log:
Check if strerror_r needs decl before adding the decl - Also see r6638 & ticket #1048

Modified: mpich2/trunk/configure.in
===================================================================
--- mpich2/trunk/configure.in	2010-05-15 17:26:47 UTC (rev 6656)
+++ mpich2/trunk/configure.in	2010-05-17 15:52:56 UTC (rev 6657)
@@ -5132,6 +5132,9 @@
 # in MPIU_Strerror (whose implementation is broken if strerror is not found)
 AC_CHECK_FUNCS(strerror strncasecmp)
 AC_FUNC_STRERROR_R
+if test "$ac_cv_func_strerror_r" = "yes" ; then
+    PAC_FUNC_NEEDS_DECL([#include <string.h>],strerror_r)
+fi
 
 # Use snprintf if possible when creating messages
 AC_CHECK_FUNCS(snprintf)

Modified: mpich2/trunk/src/util/mem/strerror.c
===================================================================
--- mpich2/trunk/src/util/mem/strerror.c	2010-05-15 17:26:47 UTC (rev 6656)
+++ mpich2/trunk/src/util/mem/strerror.c	2010-05-17 15:52:56 UTC (rev 6657)
@@ -9,7 +9,7 @@
  * different software packages, perhaps someday by moving it to MPL. */
 #include "mpiimpl.h"
 
-#if defined(HAVE_STRERROR_R) && !defined(HAVE_STRERROR_R_DECL)
+#if defined(HAVE_STRERROR_R) && defined(NEEDS_STRERROR_R_DECL)
 int strerror_r(int errnum, char *strerrbuf, size_t buflen);
 #endif