summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-03-25 11:31:38 +0100
committerVolker Lendecke <vlendec@samba.org>2011-03-25 13:16:35 +0100
commit273e7cbb9989fd1f2ae4d871369232a2be8656f7 (patch)
treeeec7fa7e1ce25af02dfc0b04bc843dea2c9f472b
parentf0922147fec83fc4900208669e6cb0e0607757cd (diff)
downloadsamba-273e7cbb9989fd1f2ae4d871369232a2be8656f7.tar.gz
samba-273e7cbb9989fd1f2ae4d871369232a2be8656f7.tar.bz2
samba-273e7cbb9989fd1f2ae4d871369232a2be8656f7.zip
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
-rw-r--r--source3/include/includes.h2
1 files changed, 1 insertions, 1 deletions
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_;