Re: config.h inclusion leftovers
[EMAIL PROTECTED] (Karl Berry) wrote: Hmm. Just noticed that those files are normally mirrored from gettext (see gnulib/config/srclist.txt). Yes, although I haven't autoupdated yet because of those differences. Bruno, would you accept Ralf's patch so we don't have to decouple those files? Per Bruno, the checking/mirroring for gettext happens off the latest gettext *release*, not its development sources. So even if Bruno accepts the patches, we have to decouple those files until the next release, if we want the changes in gnulib now. (Personally I'd rather keep mirroring them.) Ok. I've reverted the changes to those three files, for now :( If we can't clean up such little nit-picky details because of such a constraint, then maybe it's time to remove the constraint. Does anyone object to gnulib getting setenv.c and unsetenv.c from coreutils instead? I had it the `right' way six months ago, and reluctantly changed to the `#ifdef HAVE_CONFIG_H' to stay in sync with gnulib. That's backwards. gnulib should be setting the standard, not toeing some arbitrary line. ___ bug-gnulib mailing list bug-gnulib@gnu.org http://lists.gnu.org/mailman/listinfo/bug-gnulib
Re: config.h inclusion leftovers
Ralf Wildenhues [EMAIL PROTECTED] wrote: The following patch changes the last files over to the agreed-to style for inclusion of `config.h'. * lib/mkdtemp.c, lib/setenv.c, lib/unsetenv.c: Normalize inclusion of `config.h'. Applied. Hmm. Just noticed that those files are normally mirrored from gettext (see gnulib/config/srclist.txt). Bruno, would you accept Ralf's patch so we don't have to decouple those files? I noticed some more small differences, when comparing to coreutils copies. We include unistd.h unconditionally everywhere else. Why not do so here, too? * mkdtemp.c, setenv.c, unsetenv.c: Include unistd.h unconditionally. How about this additional patch? Index: setenv.c === RCS file: /sources/gnulib/gnulib/lib/setenv.c,v retrieving revision 1.14 diff -u -p -r1.14 setenv.c --- setenv.c24 Feb 2006 10:09:59 - 1.14 +++ setenv.c24 Feb 2006 10:12:13 - @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,1995-1999,2000-2003 Free Software Foundation, Inc. +/* Copyright (C) 1992,1995-1999,2000-2003,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -27,9 +27,7 @@ #include stdlib.h #include string.h -#if _LIBC || HAVE_UNISTD_H -# include unistd.h -#endif +#include unistd.h #if !_LIBC # include allocsa.h Index: unsetenv.c === RCS file: /sources/gnulib/gnulib/lib/unsetenv.c,v retrieving revision 1.6 diff -u -p -r1.6 unsetenv.c --- unsetenv.c 24 Feb 2006 10:09:59 - 1.6 +++ unsetenv.c 24 Feb 2006 10:12:13 - @@ -1,4 +1,4 @@ -/* Copyright (C) 1992,1995-1999,2000-2002 Free Software Foundation, Inc. +/* Copyright (C) 1992,1995-1999,2000-2002,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -29,9 +29,7 @@ extern int errno; #include stdlib.h #include string.h -#if _LIBC || HAVE_UNISTD_H -# include unistd.h -#endif +#include unistd.h #if !_LIBC # define __environ environ ___ bug-gnulib mailing list bug-gnulib@gnu.org http://lists.gnu.org/mailman/listinfo/bug-gnulib
Re: config.h inclusion leftovers
Hmm. Just noticed that those files are normally mirrored from gettext (see gnulib/config/srclist.txt). Yes, although I haven't autoupdated yet because of those differences. Bruno, would you accept Ralf's patch so we don't have to decouple those files? Per Bruno, the checking/mirroring for gettext happens off the latest gettext *release*, not its development sources. So even if Bruno accepts the patches, we have to decouple those files until the next release, if we want the changes in gnulib now. (Personally I'd rather keep mirroring them.) Thanks, k ___ bug-gnulib mailing list bug-gnulib@gnu.org http://lists.gnu.org/mailman/listinfo/bug-gnulib
Re: config.h inclusion leftovers
Ralf Wildenhues [EMAIL PROTECTED] wrote: The following patch changes the last files over to the agreed-to style for inclusion of `config.h'. * lib/mkdtemp.c, lib/setenv.c, lib/unsetenv.c: Normalize inclusion of `config.h'. Thanks. Applied. ___ bug-gnulib mailing list bug-gnulib@gnu.org http://lists.gnu.org/mailman/listinfo/bug-gnulib
