math, unistd: avoid redundant includes

* lib/math.in.h (isnan): No need to re-include <math.h>.
* lib/unistd.in.h (getcwd): Likewise, for <stdlib.h>.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 434b7b30620cc28b06395e17d30a5d3535b6e347..903ea914ca42acfbd709ce9ef6574671199e5ed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-12-22  Eric Blake  <ebb9@byu.net>
 
+       math, unistd: avoid redundant includes
+       * lib/math.in.h (isnan): No need to re-include <math.h>.
+       * lib/unistd.in.h (getcwd): Likewise, for <stdlib.h>.
+
        getsubopt: work around cygwin bug
        * lib/stdlib.in.h (includes): Move unistd inclusion sooner, to
        avoid conflicting with system getsubopt.

diff --git a/lib/math.in.h b/lib/math.in.h
index 614896e366dc959cc8fa34b5f84d6cff2716f8e9..803fd2db9fe7fdbf7823e61af446cb759799747a 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -411,7 +411,6 @@ extern int gl_isinfl (long double x);
 # if @HAVE_ISNANF@
 /* The original <math.h> included above provides a declaration of isnan macro
    or (older) isnanf function.  */
-#  include <math.h>
 #  if __GNUC__ >= 4
     /* GCC 4.0 and newer provides three built-ins for isnan.  */
 #   undef isnanf
@@ -434,7 +433,6 @@ extern int isnanf (float x);
    to 'double' numbers earlier but now is a type-generic macro.  */
 # if @HAVE_ISNAND@
 /* The original <math.h> included above provides a declaration of isnan macro.  */
-#  include <math.h>
 #  if __GNUC__ >= 4
     /* GCC 4.0 and newer provides three built-ins for isnan.  */
 #   undef isnand
@@ -455,7 +453,6 @@ extern int isnand (double x);
 /* Test for NaN for 'long double' numbers.  */
 # if @HAVE_ISNANL@
 /* The original <math.h> included above provides a declaration of isnan macro or (older) isnanl function.  */
-#  include <math.h>
 #  if __GNUC__ >= 4
     /* GCC 4.0 and newer provides three built-ins for isnan.  */
 #   undef isnanl

diff --git a/lib/unistd.in.h b/lib/unistd.in.h
index 0cf9a87aa7546dca9c51f5df545e0b3266fc7fbd..f37c7baffe3e4df2d99dca65e2c18274240368d0 100644 (file)
--- a/lib/unistd.in.h
+++ b/lib/unistd.in.h
@@ -346,9 +346,6 @@ extern int ftruncate (int fd, off_t length);
 
 
 #if @GNULIB_GETCWD@
-/* Include the headers that might declare getcwd so that they will not
-   cause confusion if included after this file.  */
-# include <stdlib.h>
 # if @REPLACE_GETCWD@
 /* Get the name of the current working directory, and put it in SIZE bytes
    of BUF.