This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
config.h inclusion in gnulib-used files
- From: Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>
- To: libc-alpha at sources dot redhat dot com
- Date: Wed, 21 Sep 2005 17:51:33 +0200
- Subject: config.h inclusion in gnulib-used files
Hi there,
gnulib would like a uniform handling of the inclusion of config.h, see
the corresponding discussion[1]. The trivial patch below (against CVS)
adjusts the glibc-owned files that are distributed unmodified with
gnulib.
I have checked that no other in-tree file includes argp-fmtstream.h
but not config.h first. I have not performed any other testing.
Should this rather be in a bugzilla entry? This is my first post to
this list, and I could not find clear instructions (wrt. patches as
opposed to bug reports). Also, if desired, I could post a similar
patch for the rest of the argp/ files.
Cheers,
Ralf
[1] http://lists.gnu.org/archive/html/bug-gnulib/2005-09/msg00223.html
2005-09-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> (tiny change)
* argp/argp-fmtstream.h: Do not include config.h.
* argp/argp-eexst.c, argp/argp-fmtstream.c, argp/argp-fs-xinl.c,
argp/argp-xinl.c: Standardize inclusion of config.h, according
to gnulib.
Index: argp/argp-fmtstream.h
===================================================================
RCS file: /cvs/glibc/libc/argp/argp-fmtstream.h,v
retrieving revision 1.5
diff -u -r1.5 argp-fmtstream.h
--- argp/argp-fmtstream.h 2 Oct 2003 22:52:50 -0000 1.5
+++ argp/argp-fmtstream.h 21 Sep 2005 08:38:28 -0000
@@ -26,10 +26,6 @@
#ifndef _ARGP_FMTSTREAM_H
#define _ARGP_FMTSTREAM_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <stdio.h>
#include <string.h>
#include <unistd.h>
Index: argp/argp-eexst.c
===================================================================
RCS file: /cvs/glibc/libc/argp/argp-eexst.c,v
retrieving revision 1.3
diff -u -r1.3 argp-eexst.c
--- argp/argp-eexst.c 6 Jul 2001 04:54:44 -0000 1.3
+++ argp/argp-eexst.c 21 Sep 2005 08:38:28 -0000
@@ -19,7 +19,7 @@
02111-1307 USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
#include <sysexits.h>
Index: argp/argp-fmtstream.c
===================================================================
RCS file: /cvs/glibc/libc/argp/argp-fmtstream.c,v
retrieving revision 1.17
diff -u -r1.17 argp-fmtstream.c
--- argp/argp-fmtstream.c 20 Jul 2005 17:50:29 -0000 1.17
+++ argp/argp-fmtstream.c 21 Sep 2005 08:38:28 -0000
@@ -22,7 +22,7 @@
don't have that. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
#include <stdlib.h>
Index: argp/argp-fs-xinl.c
===================================================================
RCS file: /cvs/glibc/libc/argp/argp-fs-xinl.c,v
retrieving revision 1.4
diff -u -r1.4 argp-fs-xinl.c
--- argp/argp-fs-xinl.c 18 Oct 2004 04:17:18 -0000 1.4
+++ argp/argp-fs-xinl.c 21 Sep 2005 08:38:28 -0000
@@ -19,7 +19,7 @@
02111-1307 USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
#define ARGP_FS_EI
Index: argp/argp-xinl.c
===================================================================
RCS file: /cvs/glibc/libc/argp/argp-xinl.c,v
retrieving revision 1.5
diff -u -r1.5 argp-xinl.c
--- argp/argp-xinl.c 18 Oct 2004 04:17:18 -0000 1.5
+++ argp/argp-xinl.c 21 Sep 2005 08:38:28 -0000
@@ -19,7 +19,7 @@
02111-1307 USA. */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
#if defined _LIBC || defined HAVE_FEATURES_H