libsystemd-dns: merge into libsystemd

Also rename sd-dns -> sd-resolv.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/libsystemd/dns-util.h b/src/libsystemd/resolv-util.h
index e0284c81b1..e0284c81b1 100644
--- a/src/libsystemd/dns-util.h
+++ b/src/libsystemd/resolv-util.h
diff --git a/src/libsystemd/sd-dns.c b/src/libsystemd/sd-resolv.c
index 0f90d020ad..2db66eb2ff 100644
--- a/src/libsystemd/sd-dns.c
+++ b/src/libsystemd/sd-resolv.c
@@ -41,7 +41,7 @@
 #include <pthread.h>
 #include <sys/prctl.h>
 
-#include "sd-dns.h"
+#include "sd-resolv.h"
 #include "util.h"
 
 #define MAX_WORKERS 16
diff --git a/src/libsystemd/test-dns.c b/src/libsystemd/test-resolv.c
index b4f064f2fd..9365dd8e7b 100644
--- a/src/libsystemd/test-dns.c
+++ b/src/libsystemd/test-resolv.c
@@ -31,8 +31,8 @@
 #include <signal.h>
 #include <errno.h>
 
-#include "sd-dns.h"
-#include "dns-util.h"
+#include "sd-resolv.h"
+#include "resolv-util.h"
 #include "macro.h"
 
 int main(int argc, char *argv[]) {
diff --git a/src/systemd/sd-dns.h b/src/systemd/sd-resolv.h
index 38972db5e2..47608ce380 100644
--- a/src/systemd/sd-dns.h
+++ b/src/systemd/sd-resolv.h
@@ -1,7 +1,7 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef foosddnshfoo
-#define foosddnshfoo
+#ifndef foosdresolvhfoo
+#define foosdresolvhfoo
 
 /***
   This file is part of systemd.