From: Bruno Haible Date: Sat, 7 Aug 2021 13:11:43 +0000 (+0200) Subject: dirname-lgpl, sh-quote, system-quote, xstriconv: Clean up includes. X-Git-Tag: v1.0~2720 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=648dc42b9e0950bb586ff2312840d28479809a2d;p=gnulib.git dirname-lgpl, sh-quote, system-quote, xstriconv: Clean up includes. * lib/dirname.h: Don't include . * lib/sh-quote.h: Likewise. * lib/system-quote.h: Likewise. * lib/xstriconv.h: Likewise. --- diff --git a/ChangeLog b/ChangeLog index be764cb510..7bdffe9438 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2021-08-07 Bruno Haible + + dirname-lgpl, sh-quote, system-quote, xstriconv: Clean up includes. + * lib/dirname.h: Don't include . + * lib/sh-quote.h: Likewise. + * lib/system-quote.h: Likewise. + * lib/xstriconv.h: Likewise. + 2021-08-07 Bruno Haible dfa: Improve GCC 11 allocation-deallocation checking. diff --git a/lib/dirname.h b/lib/dirname.h index 04f823eca0..25abc7b7ea 100644 --- a/lib/dirname.h +++ b/lib/dirname.h @@ -20,7 +20,6 @@ # define DIRNAME_H_ 1 # include -# include # include # include "filename.h" # include "basename-lgpl.h" diff --git a/lib/sh-quote.h b/lib/sh-quote.h index 0101036e5f..ab440c66ab 100644 --- a/lib/sh-quote.h +++ b/lib/sh-quote.h @@ -22,7 +22,6 @@ arguments, since Unix shells interpret characters like " ", "'", "<", ">", "$", '*', '?' etc. in a special way. */ -#include #include #ifdef __cplusplus diff --git a/lib/system-quote.h b/lib/system-quote.h index b1bbf65216..6cfddd0821 100644 --- a/lib/system-quote.h +++ b/lib/system-quote.h @@ -46,7 +46,6 @@ is to truncate the entire command line. */ -#include #include #ifdef __cplusplus diff --git a/lib/xstriconv.h b/lib/xstriconv.h index d90aa4c5cf..879a772dfa 100644 --- a/lib/xstriconv.h +++ b/lib/xstriconv.h @@ -18,7 +18,6 @@ #ifndef _XSTRICONV_H #define _XSTRICONV_H -#include #include #if HAVE_ICONV #include @@ -72,6 +71,7 @@ extern char * xstr_iconv (const char *src, const char *from_codeset, const char *to_codeset) _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; + #ifdef __cplusplus } #endif