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.

diff --git a/lib/util/util.h b/lib/util/util.h
index c6805d40d94d8d6b048a5cb6d9fd54665f1333a9..dced557acbe32594d282d1a87248d4ae2598a6e5 100644 (file)
--- 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);
 
 
 void print_asc(int level, const uint8_t *buf,int len);
 

-#define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
-

 #endif /* _SAMBA_UTIL_H_ */
 #endif /* _SAMBA_UTIL_H_ */

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 4aa3c0734381bd1e90556cea4d56e968e63dad8b..930df6e36cd33227fe229b7f2d0549df934ee9ad 100644 (file)
--- 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
 
 #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_;
 void smb_panic( const char *why ) _NORETURN_;
 void dump_core(void) _NORETURN_;
 void exit_server(const char *const reason) _NORETURN_;