diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-12-30 13:41:18 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2008-12-30 16:19:42 -0800 |
| commit | 0cb430c22e9c0af2248fbc15ce97a4d760df189d (patch) | |
| tree | e16bacca97c069716e5b052de0491b839cdd270e | |
| parent | 888524623d179ceb4d540f5ac0f3b013d3ce5735 (diff) | |
| download | samba-0cb430c22e9c0af2248fbc15ce97a4d760df189d.tar.gz samba-0cb430c22e9c0af2248fbc15ce97a4d760df189d.tar.bz2 samba-0cb430c22e9c0af2248fbc15ce97a4d760df189d.zip | |
s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4
| -rw-r--r-- | lib/util/util.h | 2 | ||||
| -rw-r--r-- | source3/include/includes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index dced557acb..c6805d40d9 100644 --- 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 4e41fa3c05..3f35602ba6 100644 --- 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_; |