Revert "s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4"

[ira/wip.git] / source3 / include / includes.h

diff --git a/source3/include/includes.h b/source3/include/includes.h
index a20a17c33d78b0f581854f18d220ce1a95c66e57..930df6e36cd33227fe229b7f2d0549df934ee9ad 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -619,7 +619,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "ntlmssp.h"
 #include "auth.h"
 #include "ntdomain.h"
-#include "rpc_lsa.h"
 #include "reg_objects.h"
 #include "reg_db.h"
 #include "rpc_spoolss.h"
@@ -1051,6 +1050,8 @@ ssize_t readahead(int fd, off64_t offset, size_t count);
 #undef HAVE_MMAP
 #endif
 
+#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
+
 void smb_panic( const char *why ) _NORETURN_;
 void dump_core(void) _NORETURN_;
 void exit_server(const char *const reason) _NORETURN_;