[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Tue May 25 09:29:30 MDT 2010
The branch, master has been updated
via aa51fa0... s3:fix the waf build after registry changes.
from f12028a... s3-net: fix a "dereferencing type-punned pointer will break strict-aliasing rules" warning.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit aa51fa0ce34cc36ad757bb5ab1450c37631bb082
Author: Michael Adam <obnox at samba.org>
Date: Tue May 25 17:28:05 2010 +0200
s3:fix the waf build after registry changes.
-----------------------------------------------------------------------
Summary of changes:
source3/wscript_build | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/wscript_build b/source3/wscript_build
index 636091e..72ff748 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -304,7 +304,7 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
# registry-related objects
#
UTIL_REG_SRC = '''../libcli/registry/util_reg.c'''
-UTIL_REG_API_SRC = '''lib/util_reg_api.c'''
+REG_UTIL_MARSHALLING_OBJ = '''registry/reg_util_marshalling.c'''
REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
@@ -332,15 +332,16 @@ REG_BASE_SRC = '''registry/reg_api.c
registry/reg_cachehook.c
${REGFIO_SRC}
${REGSRCS_SRC}
- registry/reg_util.c
- ${UTIL_REG_API_SRC}
+ registry/reg_util_internal.c
+ ${REG_UTIL_MARSHALLING_OBJ}
lib/util_nttoken.c
${REG_BACKENDS_BASE_SRC}
${REG_INIT_BASIC_SRC}'''
REG_SMBCONF_SRC = '''${REG_BASE_SRC}
${REG_BACKENDS_SMBCONF_SRC}
- ${REG_INIT_SMBCONF_SRC}'''
+ ${REG_INIT_SMBCONF_SRC}
+ registry/reg_util_token.c'''
REG_FULL_SRC = '''${REG_SMBCONF_SRC}
${REG_BACKENDS_EXTRA_SRC}
--
Samba Shared Repository
More information about the samba-cvs
mailing list