From 623f13d8198b83df890f014b1d27255f4d78f35b Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Fri, 21 Oct 2016 03:00:49 -0400
Subject: wip

---
 src/systemd-timesyncd/timesyncd-conf.c      |  8 ++++----
 src/systemd-timesyncd/timesyncd-conf.h      |  2 +-
 src/systemd-timesyncd/timesyncd-gperf.gperf |  2 +-
 src/systemd-timesyncd/timesyncd-manager.c   | 26 +++++++++++++-------------
 src/systemd-timesyncd/timesyncd-manager.h   |  8 ++++----
 src/systemd-timesyncd/timesyncd-server.c    |  2 +-
 src/systemd-timesyncd/timesyncd-server.h    |  4 ++--
 src/systemd-timesyncd/timesyncd.c           | 12 ++++++------
 8 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/systemd-timesyncd')

diff --git a/src/systemd-timesyncd/timesyncd-conf.c b/src/systemd-timesyncd/timesyncd-conf.c
index f2c6efd8e2..76bcfa5ef7 100644
--- a/src/systemd-timesyncd/timesyncd-conf.c
+++ b/src/systemd-timesyncd/timesyncd-conf.c
@@ -17,10 +17,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
-#include "basic/def.h"
-#include "basic/extract-word.h"
-#include "basic/string-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/def.h"
+#include "systemd-basic/extract-word.h"
+#include "systemd-basic/string-util.h"
 
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
diff --git a/src/systemd-timesyncd/timesyncd-conf.h b/src/systemd-timesyncd/timesyncd-conf.h
index c24d54a1e3..580c285271 100644
--- a/src/systemd-timesyncd/timesyncd-conf.h
+++ b/src/systemd-timesyncd/timesyncd-conf.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "timesyncd-manager.h"
 
diff --git a/src/systemd-timesyncd/timesyncd-gperf.gperf b/src/systemd-timesyncd/timesyncd-gperf.gperf
index 7e347a033c..8956cc773d 100644
--- a/src/systemd-timesyncd/timesyncd-gperf.gperf
+++ b/src/systemd-timesyncd/timesyncd-gperf.gperf
@@ -1,7 +1,7 @@
 %{
 #include <stddef.h>
 
-#include "shared/conf-parser.h"
+#include "systemd-shared/conf-parser.h"
 
 #include "timesyncd-conf.h"
 %}
diff --git a/src/systemd-timesyncd/timesyncd-manager.c b/src/systemd-timesyncd/timesyncd-manager.c
index 9b10081961..687ef09ff3 100644
--- a/src/systemd-timesyncd/timesyncd-manager.c
+++ b/src/systemd-timesyncd/timesyncd-manager.c
@@ -31,20 +31,20 @@
 
 #include <systemd/sd-daemon.h>
 
-#include "basic/alloc-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/list.h"
-#include "basic/log.h"
-#include "basic/missing.h"
-#include "basic/ratelimit.h"
-#include "basic/socket-util.h"
-#include "basic/sparse-endian.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/time-util.h"
-#include "basic/util.h"
 #include "sd-network/network-util.h"
+#include "systemd-basic/alloc-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/log.h"
+#include "systemd-basic/missing.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-basic/socket-util.h"
+#include "systemd-basic/sparse-endian.h"
+#include "systemd-basic/string-util.h"
+#include "systemd-basic/strv.h"
+#include "systemd-basic/time-util.h"
+#include "systemd-basic/util.h"
 
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
diff --git a/src/systemd-timesyncd/timesyncd-manager.h b/src/systemd-timesyncd/timesyncd-manager.h
index a70b187089..9012801cd0 100644
--- a/src/systemd-timesyncd/timesyncd-manager.h
+++ b/src/systemd-timesyncd/timesyncd-manager.h
@@ -21,10 +21,10 @@
 
 #include <systemd/sd-event.h>
 
-#include "basic/list.h"
-#include "basic/ratelimit.h"
-#include "sd-network/sd-network.h"
-#include "sd-resolve/sd-resolve.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/ratelimit.h"
+#include "systemd-staging/sd-network.h"
+#include "systemd-staging/sd-resolve.h"
 
 typedef struct Manager Manager;
 
diff --git a/src/systemd-timesyncd/timesyncd-server.c b/src/systemd-timesyncd/timesyncd-server.c
index 42e5c8e429..b4cac7c6ed 100644
--- a/src/systemd-timesyncd/timesyncd-server.c
+++ b/src/systemd-timesyncd/timesyncd-server.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/alloc-util.h"
+#include "systemd-basic/alloc-util.h"
 
 #include "timesyncd-server.h"
 
diff --git a/src/systemd-timesyncd/timesyncd-server.h b/src/systemd-timesyncd/timesyncd-server.h
index 438146c8f7..0a5c2c8bc4 100644
--- a/src/systemd-timesyncd/timesyncd-server.h
+++ b/src/systemd-timesyncd/timesyncd-server.h
@@ -19,8 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "basic/list.h"
-#include "basic/socket-util.h"
+#include "systemd-basic/list.h"
+#include "systemd-basic/socket-util.h"
 
 typedef struct ServerAddress ServerAddress;
 typedef struct ServerName ServerName;
diff --git a/src/systemd-timesyncd/timesyncd.c b/src/systemd-timesyncd/timesyncd.c
index 7a357c2296..047f455d18 100644
--- a/src/systemd-timesyncd/timesyncd.c
+++ b/src/systemd-timesyncd/timesyncd.c
@@ -20,13 +20,13 @@
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-event.h>
 
-#include "basic/capability-util.h"
-#include "basic/clock-util.h"
-#include "basic/fd-util.h"
-#include "basic/fs-util.h"
-#include "basic/signal-util.h"
-#include "basic/user-util.h"
 #include "sd-network/network-util.h"
+#include "systemd-basic/capability-util.h"
+#include "systemd-basic/clock-util.h"
+#include "systemd-basic/fd-util.h"
+#include "systemd-basic/fs-util.h"
+#include "systemd-basic/signal-util.h"
+#include "systemd-basic/user-util.h"
 
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
-- 
cgit v1.2.3-54-g00ecf