From 5ff811558adf7013f9fd9109fa794dd4e5ee8c91 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 2 Nov 2009 06:03:20 -0700 Subject: [PATCH] maint: avoid compiler warnings in m4 macros * m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Avoid unused variable. * m4/rmdir.m4 (gl_FUNC_RMDIR): Include correct header. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ m4/rmdir.m4 | 3 ++- m4/ungetc.m4 | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bcc837e61..8fd4b77ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-02 Eric Blake + + maint: avoid compiler warnings in m4 macros + * m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Avoid unused variable. + * m4/rmdir.m4 (gl_FUNC_RMDIR): Include correct header. + 2009-11-02 Simon Josefsson * m4/pmccabe2html.m4: Remove file. diff --git a/m4/rmdir.m4 b/m4/rmdir.m4 index addd69db7..599b78957 100644 --- a/m4/rmdir.m4 +++ b/m4/rmdir.m4 @@ -1,4 +1,4 @@ -# rmdir.m4 serial 6 +# rmdir.m4 serial 7 dnl Copyright (C) 2002, 2005, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,6 +30,7 @@ AC_DEFUN([gl_FUNC_RMDIR], [AC_LANG_PROGRAM( [[#include #include + #include ]], [[return !rmdir ("conftest.file/") || errno != ENOTDIR || !rmdir ("conftest.dir/./");]])], [gl_cv_func_rmdir_works=yes], [gl_cv_func_rmdir_works=no], diff --git a/m4/ungetc.m4 b/m4/ungetc.m4 index 9236d4c83..eb652356b 100644 --- a/m4/ungetc.m4 +++ b/m4/ungetc.m4 @@ -1,4 +1,4 @@ -# ungetc.m4 serial 1 +# ungetc.m4 serial 2 dnl Copyright (C) 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,7 +12,7 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], [gl_cv_func_ungetc_works], [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include - ]], [FILE *f; long l; + ]], [FILE *f; if (!(f = fopen ("conftest.tmp", "w+"))) return 1; if (fputs ("abc", f) < 0) return 2; rewind (f); -- 2.11.0