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/reqrep0/CMakeLists.txt | 10 ++++------ src/protocol/reqrep0/rep.c | 2 +- src/protocol/reqrep0/rep.h | 33 --------------------------------- src/protocol/reqrep0/req.c | 2 +- src/protocol/reqrep0/req.h | 34 ---------------------------------- src/protocol/reqrep0/xrep.c | 2 +- src/protocol/reqrep0/xreq.c | 2 +- 7 files changed, 8 insertions(+), 77 deletions(-) delete mode 100644 src/protocol/reqrep0/rep.h delete mode 100644 src/protocol/reqrep0/req.h (limited to 'src/protocol/reqrep0') diff --git a/src/protocol/reqrep0/CMakeLists.txt b/src/protocol/reqrep0/CMakeLists.txt index 70c075c1..bae31433 100644 --- a/src/protocol/reqrep0/CMakeLists.txt +++ b/src/protocol/reqrep0/CMakeLists.txt @@ -17,24 +17,22 @@ mark_as_advanced(NNG_PROTO_REP0) set(_DEFS) set(_SRCS) -set(_HDRS) if (NNG_PROTO_REQ0) list(APPEND _DEFS -DNNG_HAVE_REQ0) list(APPEND _SRCS protocol/reqrep0/req.c protocol/reqrep0/xreq.c - protocol/reqrep0/req.h) - list(APPEND _HDRS protocol/reqrep0/req.h) + ${PROJECT_SOURCE_DIR}/include/nng/protocol/reqrep0/req.h) + endif() if (NNG_PROTO_REP0) list(APPEND _DEFS -DNNG_HAVE_REP0) list(APPEND _SRCS protocol/reqrep0/rep.c protocol/reqrep0/xrep.c - protocol/reqrep0/rep.h) - list(APPEND _HDRS protocol/reqrep0/rep.h) + ${PROJECT_SOURCE_DIR}/include/nng/protocol/reqrep0/rep.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/reqrep0/rep.c b/src/protocol/reqrep0/rep.c index 586f7143..875918f5 100644 --- a/src/protocol/reqrep0/rep.c +++ b/src/protocol/reqrep0/rep.c @@ -12,7 +12,7 @@ #include #include "core/nng_impl.h" -#include "protocol/reqrep0/rep.h" +#include "nng/protocol/reqrep0/rep.h" // Response protocol. The REP protocol is the "reply" side of a // request-reply pair. This is useful for building RPC servers, for diff --git a/src/protocol/reqrep0/rep.h b/src/protocol/reqrep0/rep.h deleted file mode 100644 index 612127a2..00000000 --- a/src/protocol/reqrep0/rep.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_REQREP0_REP_H -#define NNG_PROTOCOL_REQREP0_REP_H - -#ifdef __cplusplus -extern "C" { -#endif - -NNG_DECL int nng_rep0_open(nng_socket *); -NNG_DECL int nng_rep0_open_raw(nng_socket *); - -#ifndef nng_rep_open -#define nng_rep_open nng_rep0_open -#endif - -#ifndef nng_rep_open -#define nng_rep_open_raw nng_rep0_open_raw -#endif - -#ifdef __cplusplus -} -#endif - -#endif // NNG_PROTOCOL_REQREP0_REP_H diff --git a/src/protocol/reqrep0/req.c b/src/protocol/reqrep0/req.c index 49d0ea66..139427a2 100644 --- a/src/protocol/reqrep0/req.c +++ b/src/protocol/reqrep0/req.c @@ -13,7 +13,7 @@ #include #include "core/nng_impl.h" -#include "protocol/reqrep0/req.h" +#include "nng/protocol/reqrep0/req.h" // Request protocol. The REQ protocol is the "request" side of a // request-reply pair. This is useful for building RPC clients, for example. diff --git a/src/protocol/reqrep0/req.h b/src/protocol/reqrep0/req.h deleted file mode 100644 index 392c7932..00000000 --- a/src/protocol/reqrep0/req.h +++ /dev/null @@ -1,34 +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_REQREP0_REQ_H -#define NNG_PROTOCOL_REQREP0_REQ_H - -#ifdef __cplusplus -extern "C" { -#endif - -NNG_DECL int nng_req0_open(nng_socket *); -NNG_DECL int nng_req0_open_raw(nng_socket *); - -#ifndef nng_req_open -#define nng_req_open nng_req0_open -#endif -#ifndef nng_req_open_raw -#define nng_req_open_raw nng_req0_open_raw -#endif - -#define NNG_OPT_REQ_RESENDTIME "req:resend-time" - -#ifdef __cplusplus -} -#endif - -#endif // NNG_PROTOCOL_REQREP0_REQ_H diff --git a/src/protocol/reqrep0/xrep.c b/src/protocol/reqrep0/xrep.c index 1fe81ac5..d89722d6 100644 --- a/src/protocol/reqrep0/xrep.c +++ b/src/protocol/reqrep0/xrep.c @@ -12,7 +12,7 @@ #include #include "core/nng_impl.h" -#include "protocol/reqrep0/rep.h" +#include "nng/protocol/reqrep0/rep.h" // Response protocol in raw mode. The REP protocol is the "reply" side of a // request-reply pair. This is useful for building RPC servers, for diff --git a/src/protocol/reqrep0/xreq.c b/src/protocol/reqrep0/xreq.c index a98c713e..271c59a6 100644 --- a/src/protocol/reqrep0/xreq.c +++ b/src/protocol/reqrep0/xreq.c @@ -13,7 +13,7 @@ #include #include "core/nng_impl.h" -#include "protocol/reqrep0/req.h" +#include "nng/protocol/reqrep0/req.h" // Request protocol. The REQ protocol is the "request" side of a // request-reply pair. This is useful for building RPC clients, for example. -- cgit v1.2.3-70-g09d2