From 6dcf81a202fbb724d07cc95111d2cb0c82486128 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 14 May 2016 09:45:49 +0200 Subject: [PATCH] lib: Move msghdr to lib/util/ Signed-off-by: Volker Lendecke Reviewed-by: Amitay Isaacs --- {source3/lib => lib/util}/msghdr.c | 2 +- {source3/lib => lib/util}/msghdr.h | 0 lib/util/wscript_build | 6 ++++++ source3/lib/unix_msg/unix_msg.c | 2 +- source3/modules/vfs_aio_fork.c | 2 +- source3/wscript_build | 5 ----- 6 files changed, 9 insertions(+), 8 deletions(-) rename {source3/lib => lib/util}/msghdr.c (99%) rename {source3/lib => lib/util}/msghdr.h (100%) diff --git a/source3/lib/msghdr.c b/lib/util/msghdr.c similarity index 99% rename from source3/lib/msghdr.c rename to lib/util/msghdr.c index 2aa2f2e0516..1aeadfc8d4d 100644 --- a/source3/lib/msghdr.c +++ b/lib/util/msghdr.c @@ -17,7 +17,7 @@ */ #include "replace.h" -#include "lib/msghdr.h" +#include "lib/util/msghdr.h" #include "lib/util/iov_buf.h" #include diff --git a/source3/lib/msghdr.h b/lib/util/msghdr.h similarity index 100% rename from source3/lib/msghdr.h rename to lib/util/msghdr.h diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 713946d27a5..d8c9f221abc 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -188,6 +188,12 @@ else: local_include=False, private_library=True) + bld.SAMBA_LIBRARY('msghdr', + source='msghdr.c', + deps='replace iov_buf', + local_include=False, + private_library=True) + bld.SAMBA3_LIBRARY('sys_rw', source='sys_rw.c sys_rw_data.c', deps='replace iov_buf', diff --git a/source3/lib/unix_msg/unix_msg.c b/source3/lib/unix_msg/unix_msg.c index bcfef2852d9..aed1f7560b5 100644 --- a/source3/lib/unix_msg/unix_msg.c +++ b/source3/lib/unix_msg/unix_msg.c @@ -24,7 +24,7 @@ #include "lib/util/dlinklist.h" #include "pthreadpool/pthreadpool.h" #include "lib/util/iov_buf.h" -#include "lib/msghdr.h" +#include "lib/util/msghdr.h" #include /* diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index 7d06b984009..e9ba4a3791d 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -28,7 +28,7 @@ #include "lib/util/tevent_unix.h" #include "lib/util/sys_rw.h" #include "lib/util/sys_rw_data.h" -#include "lib/msghdr.h" +#include "lib/util/msghdr.h" #include "smbprofile.h" #if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && !defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS) diff --git a/source3/wscript_build b/source3/wscript_build index ed2424d08e1..e348e653815 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -783,11 +783,6 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', source='lib/util_tdb.c', deps='talloc samba3-util') -bld.SAMBA3_LIBRARY('msghdr', - source='lib/msghdr.c', - deps='replace iov_buf', - private_library=True) - bld.SAMBA3_LIBRARY('samba3-util', source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/namearray.c lib/file_id.c''', deps='samba-util charset', -- 2.47.3