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@samba.org>
Autobuild-Date: Fri Mar 25 13:16:35 CET 2011 on sn-devel-104

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 96560e4f5fe5a30967b8c46170d2f9d31c39c143..7d98cd583a3e22ef6cd00d276b197781abc1c7c0 100644 (file)
--- 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_;