aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGregor Burger <gregor.burger@bhs-technologies.com>2018-11-20 11:48:03 +0100
committerGarrett D'Amore <garrett@damore.org>2018-11-22 12:28:27 -0800
commitd6bb25e1e0a25cb5aa781ac4f90b513fd5624f50 (patch)
treef081a6868a6c3d88b4df64ef20a38fb3e83925d1 /src/core
parent8a9fd805d96201c780610b765f9e6dd9f2eda642 (diff)
downloadnng-d6bb25e1e0a25cb5aa781ac4f90b513fd5624f50.tar.gz
nng-d6bb25e1e0a25cb5aa781ac4f90b513fd5624f50.tar.bz2
nng-d6bb25e1e0a25cb5aa781ac4f90b513fd5624f50.zip
move all public headers to include/nng/ folder
This change makes embedding nng + nggpp (or other projects depending on nng) in cmake easier. The header files are moved to a separate include directory. This also makes installation of the headers easier, and allows clearer identification of private vs public heade files. Some additional cleanups were performed by @gedamore, but the main credit for this change belongs with @gregorburger.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/nng_impl.h2
-rw-r--r--src/core/transport.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/nng_impl.h b/src/core/nng_impl.h
index f28ddf8c..abf47f49 100644
--- a/src/core/nng_impl.h
+++ b/src/core/nng_impl.h
@@ -10,7 +10,7 @@
#ifndef CORE_NNG_IMPL_H
#define CORE_NNG_IMPL_H
-#include "nng.h"
+#include "nng/nng.h"
// Internal implementation things for NNG, common definitions, etc.
// All internal modules wind up including this file to avoid having
diff --git a/src/core/transport.c b/src/core/transport.c
index 8485d048..e27c349e 100644
--- a/src/core/transport.c
+++ b/src/core/transport.c
@@ -11,22 +11,22 @@
#include "core/nng_impl.h"
#ifdef NNG_TRANSPORT_INPROC
-#include "transport/inproc/inproc.h"
+#include "nng/transport/inproc/inproc.h"
#endif
#ifdef NNG_TRANSPORT_IPC
-#include "transport/ipc/ipc.h"
+#include "nng/transport/ipc/ipc.h"
#endif
#ifdef NNG_TRANSPORT_TCP
-#include "transport/tcp/tcp.h"
+#include "nng/transport/tcp/tcp.h"
#endif
#ifdef NNG_TRANSPORT_TLS
-#include "transport/tls/tls.h"
+#include "nng/transport/tls/tls.h"
#endif
#ifdef NNG_TRANSPORT_WS
-#include "transport/ws/websocket.h"
+#include "nng/transport/ws/websocket.h"
#endif
#ifdef NNG_TRANSPORT_ZEROTIER
-#include "transport/zerotier/zerotier.h"
+#include "nng/transport/zerotier/zerotier.h"
#endif
#include <stdio.h>