summaryrefslogtreecommitdiff
path: root/source4/include/includes.h
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-03-20 13:22:08 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-03-20 13:22:08 +1100
commit27c6eca04c4c1bb40ff36f3a08748e2f45770aa8 (patch)
treef87d3e6ca4958e9b9102ca8ee5fb3e5f0917570e /source4/include/includes.h
parent1f25b71d199a072f5ee1bdd8786e5c1c157f5888 (diff)
parent5fe2b28f45289dc5578cdd536600f0d30a14d820 (diff)
downloadsamba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.gz
samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.tar.bz2
samba-27c6eca04c4c1bb40ff36f3a08748e2f45770aa8.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'source4/include/includes.h')
-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)