[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  feb6034 talloc: make header C++ safe
      from  c8000c9 smbtorture: Fix typo in status message.

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


- Log -----------------------------------------------------------------
commit feb60345816f0fd45ea9b381fbd374b21542f518
Author: Simo Sorce <idra at samba.org>
Date:   Wed Oct 20 13:09:57 2010 -0400

    talloc: make header C++ safe
    
    Autobuild-User: Simo Sorce <idra at samba.org>
    Autobuild-Date: Wed Oct 20 18:15:09 UTC 2010 on sn-devel-104

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

Summary of changes:
 lib/talloc/talloc.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.h b/lib/talloc/talloc.h
index 8b9ade2..bc5b0fa 100644
--- a/lib/talloc/talloc.h
+++ b/lib/talloc/talloc.h
@@ -29,6 +29,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup talloc The talloc API
  *
@@ -1701,4 +1705,8 @@ void talloc_set_log_stderr(void);
 #define TALLOC_MAX_DEPTH 10000
 #endif
 
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
+
 #endif


-- 
Samba Shared Repository