diff options
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source4/include/includes.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 2c033e8b69..a9f813b7f8 100644 --- 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 d9b7759e7e..ddda21f9d8 100644 --- 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) |