Fix the build. When you do "make distclean; ./autogen; ./configure; make" and it...
authorJeremy Allison <jra@samba.org>
Fri, 13 Feb 2009 18:36:11 +0000 (10:36 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 13 Feb 2009 18:36:11 +0000 (10:36 -0800)
Jeremy.

source3/include/includes.h
source4/include/includes.h

index 2c033e8..a9f813b 100644 (file)
@@ -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_;
index d9b7759..ddda21f 100644 (file)
 /* 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)