summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-12-04 13:44:23 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-12-04 13:44:23 +0000
commit5d38ea056c82221a0ddc206cd57dd7c1852a3159 (patch)
tree9494c8025aa9e0ffc3402eba9fd93b4843fe07a6 /src/include
parent05f12f4e141e94b3aee7ec79eb6fb47ffd56a119 (diff)
downloads6-networking-5d38ea056c82221a0ddc206cd57dd7c1852a3159.tar.xz
Remove s6-tls* dependency to libs6net. Improve gen-deps to make dynlinking easier.
Diffstat (limited to 'src/include')
-rw-r--r--src/include/s6-networking/s6net-utils.h10
-rw-r--r--src/include/s6-networking/s6net.h1
-rw-r--r--src/include/s6-networking/stls.h4
3 files changed, 2 insertions, 13 deletions
diff --git a/src/include/s6-networking/s6net-utils.h b/src/include/s6-networking/s6net-utils.h
deleted file mode 100644
index 2e7d2f9..0000000
--- a/src/include/s6-networking/s6net-utils.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* ISC license. */
-
-#ifndef S6NET_UTILS_H
-#define S6NET_UTILS_H
-
-#include <sys/types.h>
-
-extern pid_t s6net_clean_tls_and_spawn (char const *const *, char const *const *, int *, uint32_t) ;
-
-#endif
diff --git a/src/include/s6-networking/s6net.h b/src/include/s6-networking/s6net.h
index fef4ef7..8778527 100644
--- a/src/include/s6-networking/s6net.h
+++ b/src/include/s6-networking/s6net.h
@@ -4,6 +4,5 @@
#define S6NET_H
#include <s6-networking/ident.h>
-#include <s6-networking/s6net-utils.h>
#endif
diff --git a/src/include/s6-networking/stls.h b/src/include/s6-networking/stls.h
index dff3bcf..dbb55fe 100644
--- a/src/include/s6-networking/stls.h
+++ b/src/include/s6-networking/stls.h
@@ -1,7 +1,7 @@
/* ISC license. */
-#ifndef STLS_INTERNAL_H
-#define STLS_INTERNAL_H
+#ifndef STLS_H
+#define STLS_H
#include <sys/types.h>
#include <tls.h>