[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-672-gfa1ead3

[Jelmer Vernooij]

The branch, master has been updated
       via  fa1ead3aa06bfccd5e62a02e6e3c88d223ed7817 (commit)
       via  0afa0ab442c4198dab76373d228f7123fd54eaec (commit)
       via  9b366d703210b493aa1389bbdd288a2b00958766 (commit)
       via  6d139ca4680abcbda5110f2f0886aa038ff62088 (commit)
       via  4a9b3052caeb8bb144803b49dcfae82395172bc3 (commit)
      from  1dadf17be847e3f93b72988bcc7e8620a8d5908c (commit)

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


- Log -----------------------------------------------------------------
commit fa1ead3aa06bfccd5e62a02e6e3c88d223ed7817
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 9 17:50:35 2009 +0100

    Use discard_const_p rather than CONST_DISCARD.

commit 0afa0ab442c4198dab76373d228f7123fd54eaec
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 9 17:48:30 2009 +0100

    Revert "s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4"
    
    lib/util already has discard_const_p.
    
    This reverts commit 0cb430c22e9c0af2248fbc15ce97a4d760df189d.

commit 9b366d703210b493aa1389bbdd288a2b00958766
Merge: 6d139ca4680abcbda5110f2f0886aa038ff62088 1dadf17be847e3f93b72988bcc7e8620a8d5908c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 9 16:51:46 2009 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 6d139ca4680abcbda5110f2f0886aa038ff62088
Merge: 4a9b3052caeb8bb144803b49dcfae82395172bc3 afa960cbbcd609123d710c301e7a9a070c1fed70
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Feb 5 16:39:28 2009 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba
    
    Conflicts:
    	librpc/ndr.pc.in

commit 4a9b3052caeb8bb144803b49dcfae82395172bc3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Jan 27 16:18:02 2009 +0100

    Define GNU_SOURCE, required if libreplace doesn't provide comparison_fn_t,
    but instead relies on a system version.

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

Summary of changes:
 lib/util/util.h                          |    2 --
 pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm |    2 +-
 source3/include/includes.h               |    2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/util.h b/lib/util/util.h
index c6805d4..dced557 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -750,6 +750,4 @@ bool unmap_file(void *start, size_t size);
 
 void print_asc(int level, const uint8_t *buf,int len);
 
-#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
-
 #endif /* _SAMBA_UTIL_H_ */
diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 44d21f0..b35762f 100644
--- a/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2173,7 +2173,7 @@ sub ParseFunctionPull($$)
 			if (grep(/in/, @{$e->{DIRECTION}})) {
 				$self->pidl("memcpy(r->out.$e->{NAME}, r->in.$e->{NAME}, ($size) * sizeof(*r->in.$e->{NAME}));");
 			} else {
-				$self->pidl("memset(CONST_DISCARD(struct $fn->{NAME} *,r->out.$e->{NAME}), 0, ($size) * sizeof(*r->out.$e->{NAME}));");
+				$self->pidl("memset(discard_const_p(struct $fn->{NAME} *, r->out.$e->{NAME}), 0, ($size) * sizeof(*r->out.$e->{NAME}));");
 			}
 		} else {
 			$self->pidl("NDR_PULL_ALLOC($ndr, r->out.$e->{NAME});");
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4aa3c07..930df6e 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1050,6 +1050,8 @@ ssize_t readahead(int fd, off64_t offset, size_t count);
 #undef HAVE_MMAP
 #endif
 
+#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
+
 void smb_panic( const char *why ) _NORETURN_;
 void dump_core(void) _NORETURN_;
 void exit_server(const char *const reason) _NORETURN_;


-- 
Samba Shared Repository