diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-25 18:18:27 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-07-25 12:03:40 +0200 |
| commit | 6e72370fd7d55950820a6a8332cd4364e97ba28a (patch) | |
| tree | c1ad34d155faed92d0fbb6b3eb9f511103d9bc21 /lib/ccan/likely | |
| parent | 91bc5a0d75c94285093cd43b2d7ba3bf5c4b4085 (diff) | |
| download | samba-6e72370fd7d55950820a6a8332cd4364e97ba28a.tar.gz samba-6e72370fd7d55950820a6a8332cd4364e97ba28a.tar.bz2 samba-6e72370fd7d55950820a6a8332cd4364e97ba28a.zip | |
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 <rusty@rustcorp.com.au>
Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Mon Jul 25 12:03:40 CEST 2011 on sn-devel-104
Diffstat (limited to 'lib/ccan/likely')
| -rw-r--r-- | lib/ccan/likely/_info | 2 | ||||
| -rw-r--r-- | lib/ccan/likely/likely.c | 1 | ||||
| -rw-r--r-- | lib/ccan/likely/likely.h | 1 |
3 files changed, 3 insertions, 1 deletions
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 <rusty@rustcorp.com.au> * * 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 <ccan/likely/likely.h> #include <ccan/hash/hash.h> 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" |