From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 24 Mar 2011 04:40:45 +0000 (+1100)
Subject: s3-includes: fixed CONST_DISCARD() to actually discard const
X-Git-Tag: ldb-1.1.0~539
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37261928bec145f4cbd85f3e409063563c00ac9e;p=thirdparty%2Fsamba.git

s3-includes: fixed CONST_DISCARD() to actually discard const

a cast is not enough

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 7d98cd583a3..96560e4f5fe 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)      ((type) ((void *) (ptr)))
+#define CONST_DISCARD(type, ptr)      discard_const_p(type, ptr)
 #endif
 
 void dump_core(void) _NORETURN_;