error: Use system's fcntl function.

diff --git a/ChangeLog b/ChangeLog
index ca5dc3678b4cc01eaedb4b1804cc1639fa27a5e2..865b1b82da09dcf6106710d7a2ea1b6495c04dd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-09  Bruno Haible  <bruno@clisp.org>
+
+       error: Use system's fcntl function.
+       * lib/error.c (fcntl): Undefine.
+
 2010-05-09  Jim Meyering  <meyering@redhat.com>
 
        verify: adjust formatting to be more consistent

diff --git a/lib/error.c b/lib/error.c
index 84193a9a6e2e9ab2f6a931e3a596bf235da67632..ed9dba0d27c6a3e7c4a8a8938ca27685e6af97af 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -94,6 +94,9 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 #  include <windows.h>
 # endif
 
+/* The gnulib override of fcntl is not needed in this file.  */
+# undef fcntl
+
 # if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
 #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"