[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  273e7cb Revert "s3-includes: fixed CONST_DISCARD() to actually discard const"
      from  f092214 charcnv: ensure convert_string_error doesn't conflict with s3 function

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


- Log -----------------------------------------------------------------
commit 273e7cbb9989fd1f2ae4d871369232a2be8656f7
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Mar 25 11:31:38 2011 +0100

    Revert "s3-includes: fixed CONST_DISCARD() to actually discard const"
    
    This reverts commit 37261928bec145f4cbd85f3e409063563c00ac9e.
    
    In source3 this creates a warning of the form
    
    passdb/pdb_ldap.c:4565: warning: passing argument 2 of ‘pull_utf8_talloc’ from incompatible pointer type
    include/proto.h:444: note: expected ‘char **’ but argument is of type ‘char ***’
    
    for every use of CONST_DISCARD.
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Fri Mar 25 13:16:35 CET 2011 on sn-devel-104

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

Summary of changes:
 source3/include/includes.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 96560e4..7d98cd5 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -752,7 +752,7 @@ ssize_t readahead(int fd, off64_t offset, size_t count);
 #endif
 
 #ifndef CONST_DISCARD
-#define CONST_DISCARD(type, ptr)      discard_const_p(type, ptr)
+#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
 #endif
 
 void dump_core(void) _NORETURN_;


-- 
Samba Shared Repository