PROTON-1344: Add pn_proactor_t and pn_listener_t to <proton/types.h>
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/a96bccb2 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/a96bccb2 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/a96bccb2 Branch: refs/heads/master Commit: a96bccb23209f2bcf82ea6d3508ce4ac77316b99 Parents: 3ca4bdc Author: Andrew Stitcher <[email protected]> Authored: Tue Feb 7 15:01:47 2017 -0500 Committer: Andrew Stitcher <[email protected]> Committed: Thu Feb 9 21:31:15 2017 -0500 ---------------------------------------------------------------------- proton-c/include/proton/listener.h | 15 +-------------- proton-c/include/proton/proactor.h | 14 +------------- proton-c/include/proton/types.h | 6 ++++++ 3 files changed, 8 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a96bccb2/proton-c/include/proton/listener.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/listener.h b/proton-c/include/proton/listener.h index 8b70c9a..729c095 100644 --- a/proton-c/include/proton/listener.h +++ b/proton-c/include/proton/listener.h @@ -20,6 +20,7 @@ * under the License. */ +#include <proton/condition.h> #include <proton/types.h> #ifdef __cplusplus @@ -37,20 +38,6 @@ extern "C" { */ /** - * @cond INTERNAL - */ -typedef struct pn_proactor_t pn_proactor_t; -typedef struct pn_condition_t pn_condition_t; -/** - * @endcond - */ - -/** - * A listener accepts connections. - */ -typedef struct pn_listener_t pn_listener_t; - -/** * Create a listener. * * You can use pn_listener_set_context() or pn_listener_attachments() to set http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a96bccb2/proton-c/include/proton/proactor.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/proactor.h b/proton-c/include/proton/proactor.h index b8fb16a..695bbb1 100644 --- a/proton-c/include/proton/proactor.h +++ b/proton-c/include/proton/proactor.h @@ -23,20 +23,13 @@ #include <proton/types.h> #include <proton/import_export.h> #include <proton/listener.h> +#include <proton/event.h> #ifdef __cplusplus extern "C" { #endif /** - * @cond INTERNAL - */ -typedef struct pn_condition_t pn_condition_t; -/** - * @endcond - */ - -/** * @file * * **Experimental** - Multithreaded IO @@ -58,11 +51,6 @@ typedef struct pn_condition_t pn_condition_t; */ /** - * The proactor, see pn_proactor() - */ -typedef struct pn_proactor_t pn_proactor_t; - -/** * Create a proactor. Must be freed with pn_proactor_free() */ pn_proactor_t *pn_proactor(void); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/a96bccb2/proton-c/include/proton/types.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/types.h b/proton-c/include/proton/types.h index c28beac..4400393 100644 --- a/proton-c/include/proton/types.h +++ b/proton-c/include/proton/types.h @@ -426,6 +426,12 @@ typedef struct pn_transport_t pn_transport_t; * A pn_handler_t is target of ::pn_event_t dispatched by the pn_reactor_t */ typedef struct pn_handler_t pn_handler_t; + +/** + * + */ +typedef struct pn_proactor_t pn_proactor_t; +typedef struct pn_listener_t pn_listener_t; /** * @endcond */ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
