perror: Fix compilation error.

* lib/perror.c: Don't include intprops.h, verify.h, strerror-impl.h.
Undefine fprintf, not sprintf.
* modules/perror (Depends-on): Remove intprops, verify.

diff --git a/ChangeLog b/ChangeLog
index a412e01367e09d98cfd6b5032e253223e712cb55..18d68be3b04abc1744e3899746b6439e45d9877e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-04  Bruno Haible  <bruno@clisp.org>
+
+       perror: Fix compilation error.
+       * lib/perror.c: Don't include intprops.h, verify.h, strerror-impl.h.
+       Undefine fprintf, not sprintf.
+       * modules/perror (Depends-on): Remove intprops, verify.
+
 2011-06-04  Bruno Haible  <bruno@clisp.org>
 
        setlocale: Enable replacement on Cygwin 1.5.

diff --git a/lib/perror.c b/lib/perror.c
index 88981d165826ca2789d130e9b02e5367ba177165..6e4aab7fe634ee9535de8f58bc0d40de559e64bc 100644 (file)
--- a/lib/perror.c
+++ b/lib/perror.c
@@ -24,18 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "intprops.h"
-#include "verify.h"
-
 /* Use the system functions, not the gnulib overrides in this file.  */
-#undef sprintf
-
-/* my_strerror (errnum) is equivalent to strerror (errnum).
-   But it uses its own buffer, not the one from strerror().  */
-#define STATIC static
-#undef strerror
-#define strerror my_strerror
-#include "strerror-impl.h"
+#undef fprintf
 
 void
 perror (const char *string)

diff --git a/modules/perror b/modules/perror
index 38e28ce6338efc857f4e8f814fb30823546b69e2..6ad5448657827e44a1bb0dfef80c933369d9405b 100644 (file)
--- a/modules/perror
+++ b/modules/perror
@@ -8,8 +8,6 @@ m4/perror.m4
 Depends-on:
 stdio
 errno            [test $REPLACE_PERROR = 1]
-intprops         [test $REPLACE_PERROR = 1]
-verify           [test $REPLACE_PERROR = 1]
 strerror_r-posix [test $REPLACE_PERROR = 1]
 
 configure.ac: