Fix the build. When you do "make distclean; ./autogen; ./configure; make" and it...

Jeremy.

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2c033e8b69ae26ef8e7420e25885871efcb803aa..a9f813b7f85a186022660267524beecebf1d54a2 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -1049,7 +1049,9 @@ ssize_t readahead(int fd, off64_t offset, size_t count);
 #undef HAVE_MMAP
 #endif
 
+#ifndef CONST_DISCARD
 #define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
+#endif
 
 void smb_panic( const char *why ) _NORETURN_;
 void dump_core(void) _NORETURN_;

diff --git a/source4/include/includes.h b/source4/include/includes.h
index d9b7759e7e9ee47807ce498b15706e69affc5d12..ddda21f9d8efa55c0ef350393828369995662d4a 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -64,6 +64,10 @@
 /* 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)