diff options
| author | Gregor Burger <gregor.burger@bhs-technologies.com> | 2018-11-20 11:48:03 +0100 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-11-22 12:28:27 -0800 |
| commit | d6bb25e1e0a25cb5aa781ac4f90b513fd5624f50 (patch) | |
| tree | f081a6868a6c3d88b4df64ef20a38fb3e83925d1 /src/transport/tls | |
| parent | 8a9fd805d96201c780610b765f9e6dd9f2eda642 (diff) | |
| download | nng-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/transport/tls')
| -rw-r--r-- | src/transport/tls/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/transport/tls/tls.c | 4 | ||||
| -rw-r--r-- | src/transport/tls/tls.h | 18 |
3 files changed, 3 insertions, 23 deletions
diff --git a/src/transport/tls/CMakeLists.txt b/src/transport/tls/CMakeLists.txt index 80bc60af..8668ee4a 100644 --- a/src/transport/tls/CMakeLists.txt +++ b/src/transport/tls/CMakeLists.txt @@ -15,10 +15,8 @@ mark_as_advanced(NNG_TRANSPORT_TLS) if (NNG_TRANSPORT_TLS) set(_DEFS -DNNG_TRANSPORT_TLS) - set(_SRCS transport/tls/tls.c transport/tls/tls.h) - set(_HDRS transport/tls/tls.h) + set(_SRCS transport/tls/tls.c ${PROJECT_SOURCE_DIR}/include/nng/transport/tls/tls.h) set(NNG_DEFS ${NNG_DEFS} ${_DEFS} PARENT_SCOPE) set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE) - set(NNG_HDRS ${NNG_HDRS} ${_HDRS} PARENT_SCOPE) endif() diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c index a8f196f7..867be9b8 100644 --- a/src/transport/tls/tls.c +++ b/src/transport/tls/tls.c @@ -14,9 +14,9 @@ #include "core/nng_impl.h" -#include "supplemental/tls/tls.h" +#include "nng/supplemental/tls/tls.h" #include "supplemental/tls/tls_api.h" -#include "tls.h" +#include "nng/transport/tls/tls.h" // TLS over TCP transport. Platform specific TCP operations must be // supplied as well, and uses the supplemental TLS v1.2 code. It is not diff --git a/src/transport/tls/tls.h b/src/transport/tls/tls.h deleted file mode 100644 index a3fa0eb9..00000000 --- a/src/transport/tls/tls.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> -// Copyright 2018 Capitar IT Group BV <info@capitar.com> -// -// This software is supplied under the terms of the MIT License, a -// copy of which should be located in the distribution where this -// file was obtained (LICENSE.txt). A copy of the license may also be -// found online at https://opensource.org/licenses/MIT. -// - -#ifndef NNG_TRANSPORT_TLS_TLS_H -#define NNG_TRANSPORT_TLS_TLS_H - -// TLS transport. This is used for communication via TLS v1.2 over TCP/IP. - -NNG_DECL int nng_tls_register(void); - -#endif // NNG_TRANSPORT_TLS_TLS_H |