diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-02-23 14:48:46 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-02-23 14:48:46 -0800 |
| commit | c457bddfae64521ea9861f2211e6cb25858559b3 (patch) | |
| tree | 4c0ef1c7450198ce14ef4fbcdddb5d47e911fb4f /src | |
| parent | c31c9147320741904b604e2172f99d5ca08eb417 (diff) | |
| download | nng-c457bddfae64521ea9861f2211e6cb25858559b3.tar.gz nng-c457bddfae64521ea9861f2211e6cb25858559b3.tar.bz2 nng-c457bddfae64521ea9861f2211e6cb25858559b3.zip | |
Move compatibility header so that <nanomsg/nn.h> works.
Basically, we have moved the compat stuff into a separate directory.
Compatibility layer users will have to update their compile flags, but
should be able to avoid changing any *source* files with this change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/compat/nanomsg/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/compat/nanomsg/nn.c (renamed from src/nng_compat.c) | 6 | ||||
| -rw-r--r-- | src/compat/nanomsg/nn.h (renamed from src/nng_compat.h) | 0 |
4 files changed, 20 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2cf03e45..52f4f354 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,9 +28,6 @@ set (NNG_SOURCES nng.c nng.h - nng_compat.c - nng_compat.h - core/defs.h core/aio.c @@ -128,6 +125,8 @@ endif() set (NNG_HEADERS nng.h) +add_subdirectory(compat/nanomsg) + add_subdirectory(supplemental/base64) add_subdirectory(supplemental/http) add_subdirectory(supplemental/sha1) diff --git a/src/compat/nanomsg/CMakeLists.txt b/src/compat/nanomsg/CMakeLists.txt new file mode 100644 index 00000000..d1a692b7 --- /dev/null +++ b/src/compat/nanomsg/CMakeLists.txt @@ -0,0 +1,15 @@ +# +# Copyright 2018 Capitar IT Group BV <info@capitar.com> +# Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +# +# 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. +# + +set(COMPAT_SOURCES compat/nanomsg/nn.c) +set(COMPAT_HEADERS compat/nanomsg/nn.h) + +set(NNG_SOURCES ${NNG_SOURCES} ${COMPAT_SOURCES} PARENT_SCOPE) +set(NNG_HEADERS ${NNG_HEADERS} ${COMPAT_HEADERS} PARENT_SCOPE) diff --git a/src/nng_compat.c b/src/compat/nanomsg/nn.c index 35bacb6f..1d5bcfbb 100644 --- a/src/nng_compat.c +++ b/src/compat/nanomsg/nn.c @@ -1,6 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> +// Copyright 2018 Garrett D'Amore <garrett@damore.org> +// 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 @@ -8,7 +8,7 @@ // found online at https://opensource.org/licenses/MIT. // -#include "nng_compat.h" +#include "nn.h" #include "nng.h" #include "protocol/bus0/bus.h" #include "protocol/pair0/pair.h" diff --git a/src/nng_compat.h b/src/compat/nanomsg/nn.h index 8c5cee6f..8c5cee6f 100644 --- a/src/nng_compat.h +++ b/src/compat/nanomsg/nn.h |