From 6e72370fd7d55950820a6a8332cd4364e97ba28a Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 25 Jul 2011 18:18:27 +0930 Subject: lib/ccan: update to init-1192-gdd04041 This imports licensing clarifications and updates as discussed on samba-technical ("Subject: Re: ccan code breaks older build farm systems"). In particular, the recent version have per-file license markers, and some modules are relicenced more liberally: in particular Simo pointed out that htable was GPL, and indirectly included by libtdb2, which would have made that GPL as well. Signed-off-by: Rusty Russell Autobuild-User: Rusty Russell Autobuild-Date: Mon Jul 25 12:03:40 CEST 2011 on sn-devel-104 --- lib/ccan/likely/_info | 2 +- lib/ccan/likely/likely.c | 1 + lib/ccan/likely/likely.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/ccan/likely') diff --git a/lib/ccan/likely/_info b/lib/ccan/likely/_info index 471c1ffc78..252169b362 100644 --- a/lib/ccan/likely/_info +++ b/lib/ccan/likely/_info @@ -9,7 +9,7 @@ * help you annotate rare paths in your code for the convenience of the * compiler and the reader. * - * License: LGPL (2 or any later version) + * License: LGPL (v2.1 or any later version) * Author: Rusty Russell * * Example: diff --git a/lib/ccan/likely/likely.c b/lib/ccan/likely/likely.c index 8893d0b6d2..faa2bd8eb8 100644 --- a/lib/ccan/likely/likely.c +++ b/lib/ccan/likely/likely.c @@ -1,3 +1,4 @@ +/* Licensed under LGPLv2.1+ - see LICENSE file for details */ #ifdef CCAN_LIKELY_DEBUG #include #include diff --git a/lib/ccan/likely/likely.h b/lib/ccan/likely/likely.h index 80d695c842..c43d276759 100644 --- a/lib/ccan/likely/likely.h +++ b/lib/ccan/likely/likely.h @@ -1,3 +1,4 @@ +/* Licensed under LGPLv2.1+ - see LICENSE file for details */ #ifndef CCAN_LIKELY_H #define CCAN_LIKELY_H #include "config.h" -- cgit