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/ilog | |
| 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/ilog')
| -rw-r--r-- | lib/ccan/ilog/_info | 2 | ||||
| -rw-r--r-- | lib/ccan/ilog/ilog.c | 3 | ||||
| -rw-r--r-- | lib/ccan/ilog/ilog.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/ccan/ilog/_info b/lib/ccan/ilog/_info index 56de50d610..9a92f4e70e 100644 --- a/lib/ccan/ilog/_info +++ b/lib/ccan/ilog/_info @@ -29,7 +29,7 @@ * return 0; * } * - * License: LGPL (v2 or later) + * License: LGPL (v2.1 or any later version) * Author: Timothy B. Terriberry <tterribe@xiph.org> */ #include <string.h> diff --git a/lib/ccan/ilog/ilog.c b/lib/ccan/ilog/ilog.c index 40c5a6fd50..f42066c577 100644 --- a/lib/ccan/ilog/ilog.c +++ b/lib/ccan/ilog/ilog.c @@ -1,4 +1,5 @@ -/*(C) Timothy B. Terriberry (tterribe@xiph.org) 2001-2009 LGPL (v2 or later).*/ +/*(C) Timothy B. Terriberry (tterribe@xiph.org) 2001-2009 LGPL (v2 or later). + * See LICENSE file for details. */ #include "ilog.h" #include <limits.h> diff --git a/lib/ccan/ilog/ilog.h b/lib/ccan/ilog/ilog.h index 55dd009885..1a471c2d34 100644 --- a/lib/ccan/ilog/ilog.h +++ b/lib/ccan/ilog/ilog.h @@ -1,3 +1,4 @@ +/* Licensed under LGPLv2.1+ - see LICENSE file for details */ #if !defined(_ilog_H) # define _ilog_H (1) # include "config.h" |