mirror of
https://github.com/samba-team/samba.git
synced 2025-01-25 06:04:04 +03:00
b88e0c40b7
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>
These files are from the CCAN project (http://ccan.ozlabs.org); the _info and LICENSE files in each directory indicate their (separate) licenses. I'm trying to keep them in sync with the upstream versions as much as possible, so please be careful! Thanks! Rusty Russell <rusty@rustcorp.com.au>