From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 27 Sep 2006 17:59:19 +0000 (+0000)
Subject: [lib/ChangeLog]
X-Git-Tag: cvs-readonly~1816
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=8e10ce2ac4853d26744a6ac45678dd78ee5b055a;p=gnulib.git

[lib/ChangeLog]
* __fpending.h: Don't include <stdio_ext.h> unless
HAVE_DECL___FPENDING.  This avoids a bug with lsbcc, where
it causes <stdio_ext.h> to cause a compile-time error.
Problem reported by Nelson H. F. Beebe.
* getpass.c: Likewise, except for HAVE_DECL___FSETLOCKING instead
of HAVE_DECL___PENDING.
[m4/ChangeLog]
* fpending.m4 (gl_FUNC_FPENDING): Check for stdio_ext at most once.
* getpass.m4 (gl_PREREQ_GETPASS): Check for __fsetlocking's declaration.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 63114eeef..4393e2bbe 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* __fpending.h: Don't include <stdio_ext.h> unless
+	HAVE_DECL___FPENDING.  This avoids a bug with lsbcc, where
+	it causes <stdio_ext.h> to cause a compile-time error.
+	Problem reported by Nelson H. F. Beebe.
+	* getpass.c: Likewise, except for HAVE_DECL___FSETLOCKING instead
+	of HAVE_DECL___PENDING.
+
 2006-09-26  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* savewd.c: Include <signal.h>, for 'raise'.
diff --git a/lib/__fpending.h b/lib/__fpending.h
index 3c9be1e08..8a8aabcc2 100644
--- a/lib/__fpending.h
+++ b/lib/__fpending.h
@@ -1,6 +1,6 @@
 /* Declare __fpending.
 
-   Copyright (C) 2000, 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,13 +21,14 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#if HAVE_STDIO_EXT_H
-# include <stdio_ext.h>
-#endif
-
 #ifndef HAVE_DECL___FPENDING
 "this configure-time declaration test was not run"
 #endif
-#if !HAVE_DECL___FPENDING
+
+#if HAVE_DECL___FPENDING
+# if HAVE_STDIO_EXT_H
+#  include <stdio_ext.h>
+# endif
+#else
 size_t __fpending (FILE *);
 #endif
diff --git a/lib/getpass.c b/lib/getpass.c
index 70851b3e1..5b39b6d81 100644
--- a/lib/getpass.c
+++ b/lib/getpass.c
@@ -29,10 +29,11 @@
 
 #include <stdbool.h>
 
-#if HAVE_STDIO_EXT_H
-# include <stdio_ext.h>
-#endif
-#if !HAVE___FSETLOCKING
+#if HAVE_DECL___FSETLOCKING && HAVE___FSETLOCKING
+# if HAVE_STDIO_EXT_H
+#  include <stdio_ext.h>
+# endif
+#else
 # define __fsetlocking(stream, type)	/* empty */
 #endif
 
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 0c097346a..c50eb3d3d 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* fpending.m4 (gl_FUNC_FPENDING): Check for stdio_ext at most once.
+	* getpass.m4 (gl_PREREQ_GETPASS): Check for __fsetlocking's declaration.
+
 2006-09-26  Jim Meyering  <jim@meyering.net>
 
 	* acl.m4 (AC_FUNC_ACL): Disable ACL support altogether
diff --git a/m4/fpending.m4 b/m4/fpending.m4
index e5917c585..a073483b6 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 
 # Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -15,7 +15,7 @@ dnl we have to grub around in the FILE struct.
 
 AC_DEFUN([gl_FUNC_FPENDING],
 [
-  AC_CHECK_HEADERS(stdio_ext.h)
+  AC_CHECK_HEADERS_ONCE(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
   fp_headers='
 #     include <stdio.h>
diff --git a/m4/getpass.m4 b/m4/getpass.m4
index 014c52d14..54348ce7c 100644
--- a/m4/getpass.m4
+++ b/m4/getpass.m4
@@ -1,4 +1,4 @@
-# getpass.m4 serial 9
+# getpass.m4 serial 10
 dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -33,6 +33,11 @@ AC_DEFUN([gl_FUNC_GETPASS_GNU],
 AC_DEFUN([gl_PREREQ_GETPASS], [
   AC_CHECK_HEADERS_ONCE(stdio_ext.h termios.h)
   AC_CHECK_FUNCS_ONCE(__fsetlocking tcgetattr tcsetattr)
+  AC_CHECK_DECLS([__fsetlocking],,,
+    [#include <stdio.h>
+     #if HAVE_STDIO_EXT_H
+      #include <stdio_ext.h>
+     #endif])
   AC_CHECK_DECLS_ONCE([fflush_unlocked])
   AC_CHECK_DECLS_ONCE([flockfile])
   AC_CHECK_DECLS_ONCE([fputs_unlocked])