1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00

77 Commits

Author SHA1 Message Date
Rusty Russell
b88e0c40b7 ccan: fix likely redefinition warnings with --enable-tdb2
When we do --enable-tdb2, we start clashing with the replace.h
version:

In file included from ../lib/tdb2/tools/../private.h:25:0,
                 from ../lib/tdb2/tools/tdb2torture.c:60:
../lib/ccan/likely/likely.h:32:0: warning: "likely" redefined
../lib/replace/replace.h:762:0: note: this is the location of the previous definition
../lib/ccan/likely/likely.h:53:0: warning: "unlikely" redefined
../lib/replace/replace.h:765:0: note: this is the location of the previous definition

I don't like to #ifndef-protect them in general, since you don't want
different parts of the code to silently have different definitions,
but it's the simplest fix for now.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-08-31 13:57:14 +09:30
Volker Lendecke
f7b820c359 Adapt tally_histogram to Samba coding conventions
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Aug 10 21:12:59 CEST 2011 on sn-devel-104
2011-08-10 21:12:59 +02:00
Volker Lendecke
fed9775140 Adapt get_max_bucket to Samba coding conventions 2011-08-10 19:56:12 +02:00
Volker Lendecke
35550ba641 Adapt tally_approx_median to Samba coding conventions 2011-08-10 19:56:12 +02:00
Volker Lendecke
eac2f44cde Adapt bucket_range to Samba coding conventions 2011-08-10 19:56:12 +02:00
Volker Lendecke
06a4159455 Adapt tally_mean to Samba coding conventions 2011-08-10 19:56:12 +02:00
Volker Lendecke
f589af1982 Adapt divls64 to Samba coding conventions 2011-08-10 19:56:11 +02:00
Volker Lendecke
b32f086d64 Avoid some // style comments in divls64 2011-08-10 19:56:11 +02:00
Volker Lendecke
ee91004f4b Adapt divlu64 to Samba coding conventions 2011-08-10 19:56:11 +02:00
Volker Lendecke
26795b3dd1 Avoid some // style comments in divlu64 2011-08-10 19:56:11 +02:00
Volker Lendecke
73414d0ee7 Adapt fls64 to Samba coding conventions 2011-08-10 19:56:11 +02:00
Volker Lendecke
3f67063dfa Adapt tally_num to Samba coding conventions 2011-08-10 19:56:11 +02:00
Volker Lendecke
9c32c86783 Adapt tally_add to Samba coding conventions 2011-08-10 19:56:11 +02:00
Volker Lendecke
1fa4236c40 Adapt renormalize to Samba coding conventions 2011-08-10 19:56:10 +02:00
Volker Lendecke
4a3913fbb9 Adapt shift_overflows to Samba coding conventions 2011-08-10 19:56:10 +02:00
Volker Lendecke
a2d1d0b514 Adapt bucket_min to Samba coding conventions 2011-08-10 19:56:10 +02:00
Volker Lendecke
68d0843437 Adapt bucket_of to Samba coding conventions 2011-08-10 19:56:10 +02:00
Volker Lendecke
c6ae297d61 Adapt tally_new to Samba coding conventions 2011-08-10 19:56:10 +02:00
Volker Lendecke
066d36a1a6 Slightly simplify tally_new 2011-08-10 19:56:10 +02:00
Volker Lendecke
cb5c6f441f Fix a c++ warning 2011-08-10 19:56:09 +02:00
Volker Lendecke
54282e9f4e Fix a c++ warning 2011-08-10 19:56:09 +02:00
Rusty Russell
6e72370fd7 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
2011-07-25 12:03:40 +02:00
Rusty Russell
91bc5a0d75 lib/ccan: add README
README points out that these code snippets have their own licenses,
and that their home is elsewhere.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-07-25 18:07:11 +09:30
Rusty Russell
c019302e65 ccan/tally: don't use SIZE_MAX.
Michael Adam points out this broke the build farm (ie. OSF1 axp V5.1 2650 alpha)
so fixed in CCAN and imported from af7a902d74a7926693f55da9e21a67dde46931d4:

    Turns out it's not standard (thanks Samba build farm!)
    And the previous test had a hole in it anyway.  This one is more conservative.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Wed Jul  6 08:34:05 CEST 2011 on sn-devel-104
2011-07-06 08:34:05 +02:00
Rusty Russell
4e63ac6191 ccan: fix configure tests for __builtin_clz etc.
It's not enough to compile-test them: Michael Adam points out that nonexistant
functions merely cause a warning.  We have to try to link them.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue Jul  5 07:08:55 CEST 2011 on sn-devel-104
2011-07-05 07:08:55 +02:00
Rusty Russell
894b0273fc lib/ccan/tally.h: update for FreeBSD compile.
Based on commit 0284423676209380a2e07086b9b356096a2f93e6 from CCAN:
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Tue Jun 21 10:43:31 2011 +0930

    tally: fix FreeBSD compile, memleak in tests.

    Posix says ssize_t is in sys/types.h; on Linux stdlib.h is enough.

Autobuild-User: Rusty Russell <rusty@rustcorp.com.au>
Autobuild-Date: Tue Jun 21 05:52:12 CEST 2011 on sn-devel-104
2011-06-21 05:52:12 +02:00
Rusty Russell
754c677b0b lib: import ccan modules for tdb2
Imported from git://git.ozlabs.org/~ccan/ccan init-1161-g661d41f

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2011-06-20 11:18:34 +02:00