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

diff --git a/lib/util/util.h b/lib/util/util.h
index dced557acbe32594d282d1a87248d4ae2598a6e5..c6805d40d94d8d6b048a5cb6d9fd54665f1333a9 100644 (file)
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -750,4 +750,6 @@ 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 4e41fa3c054a1bdecb3adaf934566651d2c21871..3f35602ba6ebd8e32df452979dba9433153428dc 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1048,8 +1048,6 @@ 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_;