[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  99cdbe3... Fix builds with external talloc
      from  8283aff... Change recommended bu PC Oota.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 99cdbe35717dcd7b8adabae2b8b366dd87357807
Author: Simo Sorce <idra at samba.org>
Date:   Fri Oct 9 13:14:08 2009 -0400

    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.

-----------------------------------------------------------------------

Summary of changes:
 lib/util/talloc_stack.h         |    2 +-
 nsswitch/libwbclient/wbclient.c |    4 ++--
 source3/include/includes.h      |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h
index bb22b8a..7776711 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 f4620ff..9a1e770 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 453c8b3..b3446cb 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"


-- 
Samba Shared Repository