lib: Move msghdr to lib/util/

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

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 2aa2f2e05164a7b98d19e44502db245ab41a2420..1aeadfc8d4ddbb98a068c0f7870cc283d0c9d8ef 100644 (file)
--- 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 <sys/socket.h>
 

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 713946d27a5d40afbe95af64726977ee8711ee69..d8c9f221abc90992194bea4183e10ed69083b16d 100755 (executable)
--- 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 bcfef2852d9dc7c5578ad9f7e17c30f8e7ca3fcb..aed1f7560b59c2a46caafa01953ee8f58dfc9158 100644 (file)
--- 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 <fcntl.h>
 
 /*

diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 7d06b984009cccd7b86b4485a6b729fb1b2cee25..e9ba4a3791dfd00eaa9ef06831142bf56ed378fa 100644 (file)
--- 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 ed2424d08e1e41c740e844ed0bed55725bdd1208..e348e653815eec912785b2d60ef5471547f9ad26 100755 (executable)
--- 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',