Re: [PATCH 2/4] kwset: allow building with GCC 8
- From
SZEDER Gábor <szeder.dev@gmail.com>
- Date
- Jun 17, 2019, 18:26 UTC
- Message-ID
- <20190617182621.GI31952@szeder.dev>
- In-Reply-To
- <xmqq4l4suovx.fsf@gitster-ct.c.googlers.com>
On Fri, Jun 14, 2019 at 09:12:50AM -0700, Junio C Hamano wrote:
Show 14 quoted lines
> SZEDER Gábor <szeder.dev@gmail.com> writes: > > >> Now, the proper thing to do would be to switch to `size_t`. But this > >> would make us deviate from the "upstream" code even further, > > > > This is not entirely true: upstream already uses 'size_t', so the > > switch would actually bring our copy closer to upstream. > > Ah, earlier I said that within the context how kwset uses obstack, > it is perfectly proper to fix it like the patch in question did, but > the upstream already using size_t changes the picture quite a bit. > > I do not mind updating our copy of obstack, but make sure you pick > the version with license compatible with ours.
The licensing of obstack.{c,h} didn't change, it's still "GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version"
Note how the first patch updating these files makes only superficial changes to their license notices:
diff --git a/compat/obstack.h b/compat/obstack.h
index ced94d0118..811de588a4 100644
--- a/compat/obstack.h
+++ b/compat/obstack.h
@@ -1,6 +1,5 @@
/* obstack.h - object stack macros
- Copyright (C) 1988-1994,1996-1999,2003,2004,2005,2009
- Free Software Foundation, Inc.
+ Copyright (C) 1988-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -15,89 +14,89 @@
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
+ <https://www.gnu.org/licenses/>. */
But I rather like Ævar's idea of simply getting rid of them :)