diff options
| author | Simo Sorce <idra@samba.org> | 2009-10-09 13:14:08 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2009-10-09 13:14:08 -0400 |
| commit | 99cdbe35717dcd7b8adabae2b8b366dd87357807 (patch) | |
| tree | 6aa950e7c96e9870681ee7a793a919efd1cd23a4 | |
| parent | 8283affee6fb0bb0347aa6fcd3033a61eaf6c27d (diff) | |
| download | samba-99cdbe35717dcd7b8adabae2b8b366dd87357807.tar.gz samba-99cdbe35717dcd7b8adabae2b8b366dd87357807.tar.bz2 samba-99cdbe35717dcd7b8adabae2b8b366dd87357807.zip | |
Fix builds with external talloc
Make sure we do not reference our internal talloc directly.
Let configure define what talloc.h file to use so that builds that use an
extrenal talloc do not include 2 different versions of the talloc header.
| -rw-r--r-- | lib/util/talloc_stack.h | 2 | ||||
| -rw-r--r-- | nsswitch/libwbclient/wbclient.c | 4 | ||||
| -rw-r--r-- | source3/include/includes.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h index bb22b8a029..777671164d 100644 --- a/lib/util/talloc_stack.h +++ b/lib/util/talloc_stack.h @@ -35,7 +35,7 @@ #ifndef _TALLOC_STACK_H #define _TALLOC_STACK_H -#include "../talloc/talloc.h" +#include "talloc.h" /* * Create a new talloc stack frame. diff --git a/nsswitch/libwbclient/wbclient.c b/nsswitch/libwbclient/wbclient.c index f4620ff002..9a1e770690 100644 --- a/nsswitch/libwbclient/wbclient.c +++ b/nsswitch/libwbclient/wbclient.c @@ -23,8 +23,8 @@ /* Required Headers */ #include "replace.h" -#include "lib/talloc/talloc.h" -#include "lib/tevent/tevent.h" +#include "talloc.h" +#include "tevent.h" #include "libwbclient.h" /* From wb_common.c */ diff --git a/source3/include/includes.h b/source3/include/includes.h index 453c8b3f29..b3446cbf65 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -621,7 +621,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "tdb.h" #include "util_tdb.h" -#include "../talloc/talloc.h" +#include "talloc.h" #include "event.h" #include "../lib/util/tevent_unix.h" |