From 0afa0ab442c4198dab76373d228f7123fd54eaec Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 9 Feb 2009 17:48:30 +0100 Subject: [PATCH] Revert "s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4" lib/util already has discard_const_p. This reverts commit 0cb430c22e9c0af2248fbc15ce97a4d760df189d. --- lib/util/util.h | 2 -- source3/include/includes.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util/util.h b/lib/util/util.h index c6805d40d94..dced557acbe 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -750,6 +750,4 @@ bool unmap_file(void *start, size_t size); void print_asc(int level, const uint8_t *buf,int len); -#define CONST_DISCARD(type, ptr) ((type) ((void *) (ptr))) - #endif /* _SAMBA_UTIL_H_ */ diff --git a/source3/include/includes.h b/source3/include/includes.h index 4aa3c073438..930df6e36cd 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1050,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_; -- 2.11.4.GIT