summaryrefslogtreecommitdiff
path: root/source4/include/includes.h
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-11 01:03:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:46 -0500
commit598e82e7ad9377138b5a899724083fc5d808a249 (patch)
tree6b0ebdd87ce03675409416c2379d8329b73f4a10 /source4/include/includes.h
parente2a47719097291dac9e2ff33fbb1d1b26f26517c (diff)
downloadsamba-598e82e7ad9377138b5a899724083fc5d808a249.tar.gz
samba-598e82e7ad9377138b5a899724083fc5d808a249.tar.bz2
samba-598e82e7ad9377138b5a899724083fc5d808a249.zip
r2900: rusty pointed out to me that discard_const() can be done via a macro
on systems that have the intptr_t type, and for systems that don't have it, they also almost certainly won't have -Wcast-qual, so we can use a void* cast. (This used to be commit 2132d38f9c5ba59825558d5ba084a514ebc2626b)
Diffstat (limited to 'source4/include/includes.h')
-rw-r--r--source4/include/includes.h24
1 files changed, 22 insertions, 2 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 06e9b91347..94d15eff3f 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -1068,9 +1068,29 @@ time_t timegm(struct tm *tm);
#include <sys/xattr.h>
#endif
-#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
-
#define TALLOC_ABORT(reason) smb_panic(reason)
+
+/*
+ this is a warning hack. The idea is to use this everywhere that we
+ get the "discarding const" warning from gcc. That doesn't actually
+ fix the problem of course, but it means that when we do get to
+ cleaning them up we can do it by searching the code for
+ discard_const.
+
+ It also means that other error types aren't as swamped by the noise
+ of hundreds of const warnings, so we are more likely to notice when
+ we get new errors.
+
+ Please only add more uses of this macro when you find it
+ _really_ hard to fix const warnings. Our aim is to eventually use
+ this function in only a very few places.
+
+ Also, please call this via the discard_const_p() macro interface, as that
+ makes the return type safe.
+*/
+#define discard_const(ptr) ((void *)((intptr_t)(ptr)))
+#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
+
#endif /* _INCLUDES_H */