The branch, v3-6-test has been updated via 31c74ba talloc: make header C++ safe from dde9059 Make getpwnam_alloc() static to lib/username.c, and ensure all username lookups go through Get_Pwnam_alloc(), which is the correct wrapper function. We were using it *some* of the time anyway, so this just makes us properly consistent.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 31c74ba8c60d2c36f675a40732de57ea3d1d1903 Author: Simo Sorce <i...@samba.org> Date: Wed Oct 20 13:09:57 2010 -0400 talloc: make header C++ safe Autobuild-User: Simo Sorce <i...@samba.org> Autobuild-Date: Wed Oct 20 18:15:09 UTC 2010 on sn-devel-104 (cherry picked from commit feb60345816f0fd45ea9b381fbd374b21542f518) ----------------------------------------------------------------------- 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 0c281cc..189598d 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 * @@ -1690,4 +1694,8 @@ void talloc_set_log_stderr(void); #define TALLOC_MAX_DEPTH 10000 #endif +#ifdef __cplusplus +} /* end of extern "C" */ +#endif + #endif -- Samba Shared Repository