From: Bruno Haible <bruno@clisp.org>
Date: Sat, 4 Jun 2011 10:54:38 +0000 (+0200)
Subject: perror: Fix compilation error.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625ab0ea1bf4b92b1cbc38d1588e776f7156949e;p=pspp

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 a412e01367..18d68be3b0 100644
--- 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 88981d1658..6e4aab7fe6 100644
--- 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 38e28ce633..6ad5448657 100644
--- 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: