From cd82d4ba569a5048e506f8455d9c496a47805fc1 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Thu, 1 Oct 2009 02:09:33 +0200 Subject: s3: add perfcount idl and generated files. Guenther --- source3/include/includes.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/include/includes.h') diff --git a/source3/include/includes.h b/source3/include/includes.h index 71125140be..453c8b3f29 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -672,8 +672,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "ntdomain.h" #include "reg_objects.h" #include "reg_db.h" -#include "rpc_perfcount.h" -#include "rpc_perfcount_defs.h" +#include "librpc/gen_ndr/perfcount.h" #include "librpc/gen_ndr/notify.h" #include "librpc/gen_ndr/xattr.h" #include "librpc/gen_ndr/messaging.h" -- cgit From 99cdbe35717dcd7b8adabae2b8b366dd87357807 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 9 Oct 2009 13:14:08 -0400 Subject: 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. --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/includes.h') 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" -- cgit