From 2038dd6ce78bc856ece474626b7f039d19860bce Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Wed, 4 May 2016 22:49:31 -0400
Subject: [PATCH] Move unix.h wrapper from sessiond-comm to common
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fixes #951

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/common/Makefile.am                   | 2 +-
 src/common/runas.c                       | 3 ++-
 src/common/sessiond-comm/sessiond-comm.c | 2 +-
 src/common/sessiond-comm/sessiond-comm.h | 2 +-
 src/common/{sessiond-comm => }/unix.c    | 1 +
 src/common/{sessiond-comm => }/unix.h    | 2 --
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename src/common/{sessiond-comm => }/unix.c (99%)
 rename src/common/{sessiond-comm => }/unix.h (98%)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 5096676e0..193057c9b 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -73,7 +73,7 @@ libcommon_la_SOURCES = error.h error.c utils.c utils.h runas.c runas.h \
                        pipe.c pipe.h readwrite.c readwrite.h \
                        mi-lttng.h mi-lttng.c \
                        daemonize.c daemonize.h \
-                       sessiond-comm/unix.c sessiond-comm/unix.h \
+                       unix.c unix.h \
                        filter.c filter.h context.c context.h
 
 libcommon_la_LIBADD = \
diff --git a/src/common/runas.c b/src/common/runas.c
index 21490ac4d..b4828ad60 100644
--- a/src/common/runas.c
+++ b/src/common/runas.c
@@ -36,7 +36,8 @@
 #include <common/utils.h>
 #include <common/compat/getenv.h>
 #include <common/compat/prctl.h>
-#include <common/sessiond-comm/unix.h>
+#include <common/unix.h>
+#include <common/defaults.h>
 
 #include "runas.h"
 
diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 7a27f708c..336902a60 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -32,7 +32,7 @@
 #include "sessiond-comm.h"
 
 /* For Unix socket */
-#include "unix.h"
+#include <common/unix.h>
 /* For Inet socket */
 #include "inet.h"
 /* For Inet6 socket */
diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h
index 344ba508d..e7fd69ddd 100644
--- a/src/common/sessiond-comm/sessiond-comm.h
+++ b/src/common/sessiond-comm/sessiond-comm.h
@@ -40,7 +40,7 @@
 
 #include "inet.h"
 #include "inet6.h"
-#include "unix.h"
+#include <common/unix.h>
 
 /* Queue size of listen(2) */
 #define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
diff --git a/src/common/sessiond-comm/unix.c b/src/common/unix.c
similarity index 99%
rename from src/common/sessiond-comm/unix.c
rename to src/common/unix.c
index 8d2e03a5b..e294936ca 100644
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/unix.c
@@ -28,6 +28,7 @@
 #include <errno.h>
 
 #include <common/common.h>
+#include <common/sessiond-comm/sessiond-comm.h>
 
 #include "unix.h"
 
diff --git a/src/common/sessiond-comm/unix.h b/src/common/unix.h
similarity index 98%
rename from src/common/sessiond-comm/unix.h
rename to src/common/unix.h
index 24786b8fe..643512116 100644
--- a/src/common/sessiond-comm/unix.h
+++ b/src/common/unix.h
@@ -24,8 +24,6 @@
 #include <common/compat/socket.h>
 #include <common/macros.h>
 
-#include "sessiond-comm.h"
-
 LTTNG_HIDDEN
 int lttcomm_create_unix_sock(const char *pathname);
 LTTNG_HIDDEN
-- 
2.34.1