summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-15 15:39:15 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-15 15:39:15 +0100
commit8edd73759de2faf139d22fc1eec04192375449ae (patch)
treeb1afdbba9cc8316dcd8f3d98001fae3451b0b28a
parentc223beee2a0bd6922eda4551caec0061c86097f2 (diff)
parent75783473d180661257e3f0e3d300179caf34bd8e (diff)
downloadsamba-8edd73759de2faf139d22fc1eec04192375449ae.tar.gz
samba-8edd73759de2faf139d22fc1eec04192375449ae.tar.bz2
samba-8edd73759de2faf139d22fc1eec04192375449ae.zip
Merge branch 'nodiscard' of /home/jelmer/samba4
-rw-r--r--source4/include/includes.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index ddda21f9d8..d9b7759e7e 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -64,10 +64,6 @@
/* String routines */
#include "../lib/util/safe_string.h"
-#ifndef CONST_DISCARD
-#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr)))
-#endif
-
#if 0
/* darn, we can't do this now that we don't link the ldb tools to all the smb libs */
#define TALLOC_ABORT(reason) smb_panic(reason)