From d6bb25e1e0a25cb5aa781ac4f90b513fd5624f50 Mon Sep 17 00:00:00 2001 From: Gregor Burger Date: Tue, 20 Nov 2018 11:48:03 +0100 Subject: 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. --- src/protocol/survey0/CMakeLists.txt | 10 ++++------ src/protocol/survey0/respond.c | 2 +- src/protocol/survey0/respond.h | 33 --------------------------------- src/protocol/survey0/survey.c | 2 +- src/protocol/survey0/survey.h | 35 ----------------------------------- src/protocol/survey0/xrespond.c | 2 +- src/protocol/survey0/xsurvey.c | 2 +- 7 files changed, 8 insertions(+), 78 deletions(-) delete mode 100644 src/protocol/survey0/respond.h delete mode 100644 src/protocol/survey0/survey.h (limited to 'src/protocol/survey0') diff --git a/src/protocol/survey0/CMakeLists.txt b/src/protocol/survey0/CMakeLists.txt index b6104a54..260c3e58 100644 --- a/src/protocol/survey0/CMakeLists.txt +++ b/src/protocol/survey0/CMakeLists.txt @@ -16,25 +16,23 @@ option (NNG_PROTO_SURVEYOR0 "Enable SURVEYORv0 protocol." ON) mark_as_advanced(NNG_PROTO_SURVEYOR0) set(_DEFS) -set(_HDRS) set(_SRCS) if (NNG_PROTO_SURVEYOR0) list(APPEND _DEFS -DNNG_HAVE_SURVEYOR0) list(APPEND _SRCS protocol/survey0/survey.c protocol/survey0/xsurvey.c - protocol/survey0/survey.h) - list(APPEND _HDRS protocol/survey0/survey.h) + ${PROJECT_SOURCE_DIR}/include/nng/protocol/survey0/survey.h) + endif() if (NNG_PROTO_RESPONDENT0) list(APPEND _DEFS -DNNG_HAVE_RESPONDENT0) list(APPEND _SRCS protocol/survey0/respond.c protocol/survey0/xrespond.c - protocol/survey0/respond.h) - list(APPEND _HDRS protocol/survey0/respond.h) + ${PROJECT_SOURCE_DIR}/include/nng/protocol/survey0/respond.h) + endif() set(NNG_DEFS ${NNG_DEFS} ${_DEFS} PARENT_SCOPE) set(NNG_SRCS ${NNG_SRCS} ${_SRCS} PARENT_SCOPE) -set(NNG_HDRS ${NNG_HDRS} ${_HDRS} PARENT_SCOPE) diff --git a/src/protocol/survey0/respond.c b/src/protocol/survey0/respond.c index 80e3f2f8..593b9bae 100644 --- a/src/protocol/survey0/respond.c +++ b/src/protocol/survey0/respond.c @@ -12,7 +12,7 @@ #include #include "core/nng_impl.h" -#include "protocol/survey0/respond.h" +#include "nng/protocol/survey0/respond.h" // Respondent protocol. The RESPONDENT protocol is the "replier" side of // the surveyor pattern. This is useful for building service discovery, or diff --git a/src/protocol/survey0/respond.h b/src/protocol/survey0/respond.h deleted file mode 100644 index b865b2ac..00000000 --- a/src/protocol/survey0/respond.h +++ /dev/null @@ -1,33 +0,0 @@ -// -// Copyright 2018 Staysail Systems, Inc. -// Copyright 2018 Capitar IT Group BV -// -// 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_PROTOCOL_SURVEY0_RESPOND_H -#define NNG_PROTOCOL_SURVEY0_RESPOND_H - -#ifdef __cplusplus -extern "C" { -#endif - -NNG_DECL int nng_respondent0_open(nng_socket *); -NNG_DECL int nng_respondent0_open_raw(nng_socket *); - -#ifndef nng_respondent_open -#define nng_respondent_open nng_respondent0_open -#endif - -#ifndef nng_respondent_open_raw -#define nng_respondent_open_raw nng_respondent0_open_raw -#endif - -#ifdef __cplusplus -} -#endif - -#endif // NNG_PROTOCOL_SURVEY0_RESPOND_H diff --git a/src/protocol/survey0/survey.c b/src/protocol/survey0/survey.c index 58fa4aa6..a2eb7379 100644 --- a/src/protocol/survey0/survey.c +++ b/src/protocol/survey0/survey.c @@ -12,7 +12,7 @@ #include #include "core/nng_impl.h" -#include "protocol/survey0/survey.h" +#include "nng/protocol/survey0/survey.h" // Surveyor protocol. The SURVEYOR protocol is the "survey" side of the // survey pattern. This is useful for building service discovery, voting, etc. diff --git a/src/protocol/survey0/survey.h b/src/protocol/survey0/survey.h deleted file mode 100644 index 37f76fbf..00000000 --- a/src/protocol/survey0/survey.h +++ /dev/null @@ -1,35 +0,0 @@ -// -// Copyright 2018 Staysail Systems, Inc. -// Copyright 2018 Capitar IT Group BV -// -// 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_PROTOCOL_SURVEY0_SURVEY_H -#define NNG_PROTOCOL_SURVEY0_SURVEY_H - -#ifdef __cplusplus -extern "C" { -#endif - -NNG_DECL int nng_surveyor0_open(nng_socket *); -NNG_DECL int nng_surveyor0_open_raw(nng_socket *); - -#ifndef nng_surveyor_open -#define nng_surveyor_open nng_surveyor0_open -#endif - -#ifndef nng_surveyor_open_raw -#define nng_surveyor_open_raw nng_surveyor0_open_raw -#endif - -#define NNG_OPT_SURVEYOR_SURVEYTIME "surveyor:survey-time" - -#ifdef __cplusplus -} -#endif - -#endif // NNG_PROTOCOL_SURVEY0_SURVEY_H diff --git a/src/protocol/survey0/xrespond.c b/src/protocol/survey0/xrespond.c index 334c5ca6..9c9a1a16 100644 --- a/src/protocol/survey0/xrespond.c +++ b/src/protocol/survey0/xrespond.c @@ -12,7 +12,7 @@ #include #include "core/nng_impl.h" -#include "protocol/survey0/respond.h" +#include "nng/protocol/survey0/respond.h" // Respondent protocol. The RESPONDENT protocol is the "replier" side of // the surveyor pattern. This is useful for building service discovery, or diff --git a/src/protocol/survey0/xsurvey.c b/src/protocol/survey0/xsurvey.c index fabcc766..83a7c589 100644 --- a/src/protocol/survey0/xsurvey.c +++ b/src/protocol/survey0/xsurvey.c @@ -12,7 +12,7 @@ #include #include "core/nng_impl.h" -#include "protocol/survey0/survey.h" +#include "nng/protocol/survey0/survey.h" // Surveyor protocol. The SURVEYOR protocol is the "survey" side of the // survey pattern. This is useful for building service discovery, voting, etc. -- cgit v1.2.3-70-g09d2