From 273e7cbb9989fd1f2ae4d871369232a2be8656f7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 25 Mar 2011 11:31:38 +0100 Subject: Revert "s3-includes: fixed CONST_DISCARD() to actually discard const" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Autobuild-Date: Fri Mar 25 13:16:35 CET 2011 on sn-devel-104 --- source3/include/includes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/include/includes.h b/source3/include/includes.h index 96560e4f5f..7d98cd583a 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_; -- cgit