diff options
| author | Michael Adam <obnox@samba.org> | 2014-05-31 12:05:50 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2014-06-02 22:48:12 +0200 |
| commit | 65a6c31d9d6467bf23875daa5bab8135f7b1d347 (patch) | |
| tree | 5497876b231de113721215f4d360e95aa357ba2f | |
| parent | 86be491912811502fa29720128341f91a38266c1 (diff) | |
| download | samba-65a6c31d9d6467bf23875daa5bab8135f7b1d347.tar.gz samba-65a6c31d9d6467bf23875daa5bab8135f7b1d347.tar.xz samba-65a6c31d9d6467bf23875daa5bab8135f7b1d347.zip | |
build: rename HAVE_MSGHDR_MSG_ACCTRIGHTS to HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS
for consistency.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | source3/modules/vfs_aio_fork.c | 2 | ||||
| -rw-r--r-- | source3/wscript | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index d8a99b00359..97ec1cdf3e3 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -27,7 +27,7 @@ #include "lib/async_req/async_sock.h" #include "lib/util/tevent_unix.h" -#if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && !defined(HAVE_MSGHDR_MSG_ACCTRIGHTS) +#if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && !defined(HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS) # error Can not pass file descriptors #endif diff --git a/source3/wscript b/source3/wscript index 25dfa2e2075..cf9d7873211 100644 --- a/source3/wscript +++ b/source3/wscript @@ -561,7 +561,7 @@ int fd; msg.msg_acctrights = (caddr_t) &fd; msg.msg_acctrightslen = sizeof(fd); ''', - 'HAVE_MSGHDR_MSG_ACCTRIGHTS', + 'HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS', msg='Checking if we can use msg_acctrights for passing file descriptors', headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h') @@ -1841,7 +1841,7 @@ main() { if conf.CONFIG_SET('HAVE_STATFS_F_FSID'): default_shared_modules.extend(TO_LIST('vfs_fileid')) - if (conf.CONFIG_SET('HAVE_STRUCT_MSGHDR_MSG_CONTROL') or conf.CONFIG_SET('HAVE_MSGHDR_MSG_ACCTRIGHTS')): + if (conf.CONFIG_SET('HAVE_STRUCT_MSGHDR_MSG_CONTROL') or conf.CONFIG_SET('HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS')): default_shared_modules.extend(TO_LIST('vfs_aio_fork')) if Options.options.with_pthreadpool: |