diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-21 11:20:07 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-21 05:52:12 +0200 |
| commit | 894b0273fcff28dfaef80ce7be1bcc35d47aed65 (patch) | |
| tree | 89403d9d033612d588014d47320437be488872af /lib | |
| parent | 233a6223b2ff84dcd965d0f295fbe88ba50ce5c5 (diff) | |
| download | samba-894b0273fcff28dfaef80ce7be1bcc35d47aed65.tar.gz samba-894b0273fcff28dfaef80ce7be1bcc35d47aed65.tar.bz2 samba-894b0273fcff28dfaef80ce7be1bcc35d47aed65.zip | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ccan/tally/tally.c | 2 | ||||
| -rw-r--r-- | lib/ccan/tally/tally.h | 3 | ||||
| -rw-r--r-- | lib/ccan/tally/test/run-mean.c | 1 | ||||
| -rw-r--r-- | lib/ccan/tally/test/run-median.c | 1 | ||||
| -rw-r--r-- | lib/ccan/tally/test/run-min-max.c | 1 | ||||
| -rw-r--r-- | lib/ccan/tally/test/run-mode.c | 1 | ||||
| -rw-r--r-- | lib/ccan/tally/test/run-renormalize.c | 1 |
7 files changed, 8 insertions, 2 deletions
diff --git a/lib/ccan/tally/tally.c b/lib/ccan/tally/tally.c index 0d01907955..b1839befe3 100644 --- a/lib/ccan/tally/tally.c +++ b/lib/ccan/tally/tally.c @@ -1,4 +1,3 @@ -#include "config.h" #include <ccan/tally/tally.h> #include <ccan/build_assert/build_assert.h> #include <ccan/likely/likely.h> @@ -7,6 +6,7 @@ #include <string.h> #include <stdio.h> #include <assert.h> +#include <stdlib.h> #define SIZET_BITS (sizeof(size_t)*CHAR_BIT) diff --git a/lib/ccan/tally/tally.h b/lib/ccan/tally/tally.h index e715717507..650e2656cd 100644 --- a/lib/ccan/tally/tally.h +++ b/lib/ccan/tally/tally.h @@ -1,6 +1,7 @@ #ifndef CCAN_TALLY_H #define CCAN_TALLY_H -#include <stdlib.h> +#include "config.h" +#include <sys/types.h> struct tally; diff --git a/lib/ccan/tally/test/run-mean.c b/lib/ccan/tally/test/run-mean.c index a4a67cf9c8..b43dea6b28 100644 --- a/lib/ccan/tally/test/run-mean.c +++ b/lib/ccan/tally/test/run-mean.c @@ -25,5 +25,6 @@ int main(void) ok1(tally_mean(tally) == 0); } + free(tally); return exit_status(); } diff --git a/lib/ccan/tally/test/run-median.c b/lib/ccan/tally/test/run-median.c index f461c2ec8f..b12fd8a021 100644 --- a/lib/ccan/tally/test/run-median.c +++ b/lib/ccan/tally/test/run-median.c @@ -40,6 +40,7 @@ int main(void) ok1(median - (ssize_t)err <= i/2 && median + (ssize_t)err >= i/2); } + free(tally); return exit_status(); } diff --git a/lib/ccan/tally/test/run-min-max.c b/lib/ccan/tally/test/run-min-max.c index ffb0f2eff4..c92f6d382a 100644 --- a/lib/ccan/tally/test/run-min-max.c +++ b/lib/ccan/tally/test/run-min-max.c @@ -16,5 +16,6 @@ int main(void) ok1(tally_max(tally) == i); ok1(tally_min(tally) == -i); } + free(tally); return exit_status(); } diff --git a/lib/ccan/tally/test/run-mode.c b/lib/ccan/tally/test/run-mode.c index 7216738bfb..cd2f230443 100644 --- a/lib/ccan/tally/test/run-mode.c +++ b/lib/ccan/tally/test/run-mode.c @@ -41,5 +41,6 @@ int main(void) ok1(mode - (ssize_t)err <= 0 && mode + (ssize_t)err >= 0); } + free(tally); return exit_status(); } diff --git a/lib/ccan/tally/test/run-renormalize.c b/lib/ccan/tally/test/run-renormalize.c index 7c141528d2..8fe9dbce32 100644 --- a/lib/ccan/tally/test/run-renormalize.c +++ b/lib/ccan/tally/test/run-renormalize.c @@ -21,5 +21,6 @@ int main(void) ok1(tally->counts[0] == 2); ok1(tally->counts[1] == 0); + free(tally); return exit_status(); } |