You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2014/04/07 20:42:08 UTC
svn commit: r1585550 - in /qpid/dispatch/trunk/src: config_private.h
dispatch_private.h router_private.h server_private.h waypoint_private.h
Author: tross
Date: Mon Apr 7 18:42:08 2014
New Revision: 1585550
URL: http://svn.apache.org/r1585550
Log:
NO-JIRA - Moved non-public, shared typedefs into a single header file to avoid double-declarations.
Modified:
qpid/dispatch/trunk/src/config_private.h
qpid/dispatch/trunk/src/dispatch_private.h
qpid/dispatch/trunk/src/router_private.h
qpid/dispatch/trunk/src/server_private.h
qpid/dispatch/trunk/src/waypoint_private.h
Modified: qpid/dispatch/trunk/src/config_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/config_private.h?rev=1585550&r1=1585549&r2=1585550&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/config_private.h (original)
+++ qpid/dispatch/trunk/src/config_private.h Mon Apr 7 18:42:08 2014
@@ -20,8 +20,7 @@
*/
#include <qpid/dispatch/config.h>
-
-typedef struct qd_config_t qd_config_t;
+#include "dispatch_private.h"
void qd_config_initialize(void);
void qd_config_finalize(void);
Modified: qpid/dispatch/trunk/src/dispatch_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/dispatch_private.h?rev=1585550&r1=1585549&r2=1585550&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/dispatch_private.h (original)
+++ qpid/dispatch/trunk/src/dispatch_private.h Mon Apr 7 18:42:08 2014
@@ -19,12 +19,27 @@
* under the License.
*/
-typedef struct qd_server_t qd_server_t;
-typedef struct qd_container_t qd_container_t;
-typedef struct qd_router_t qd_router_t;
-typedef struct qd_agent_t qd_agent_t;
+//
+// The following declarations are for types that are shared between modules yet are
+// not in the public API.
+//
+typedef struct qd_server_t qd_server_t;
+typedef struct qd_container_t qd_container_t;
+typedef struct qd_router_t qd_router_t;
+typedef struct qd_agent_t qd_agent_t;
+typedef struct qd_waypoint_t qd_waypoint_t;
+typedef struct qd_config_t qd_config_t;
+typedef struct qd_router_link_t qd_router_link_t;
+typedef struct qd_router_node_t qd_router_node_t;
+typedef struct qd_router_ref_t qd_router_ref_t;
+typedef struct qd_router_link_ref_t qd_router_link_ref_t;
+typedef struct qd_router_conn_t qd_router_conn_t;
+typedef struct qd_config_phase_t qd_config_phase_t;
+typedef struct qd_config_address_t qd_config_address_t;
+
#include <qpid/dispatch/container.h>
+#include <qpid/dispatch/router.h>
#include <qpid/dispatch/connection_manager.h>
#include "server_private.h"
#include "config_private.h"
Modified: qpid/dispatch/trunk/src/router_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/router_private.h?rev=1585550&r1=1585549&r2=1585550&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/router_private.h (original)
+++ qpid/dispatch/trunk/src/router_private.h Mon Apr 7 18:42:08 2014
@@ -25,16 +25,7 @@
#include <qpid/dispatch/hash.h>
#include <qpid/dispatch/agent.h>
#include <qpid/dispatch/log.h>
-
-typedef struct qd_router_link_t qd_router_link_t;
-typedef struct qd_router_node_t qd_router_node_t;
-typedef struct qd_router_ref_t qd_router_ref_t;
-typedef struct qd_router_link_ref_t qd_router_link_ref_t;
-typedef struct qd_router_conn_t qd_router_conn_t;
-typedef struct qd_config_phase_t qd_config_phase_t;
-typedef struct qd_config_address_t qd_config_address_t;
-typedef struct qd_waypoint_t qd_waypoint_t;
-
+#include "dispatch_private.h"
void qd_router_python_setup(qd_router_t *router);
void qd_pyrouter_tick(qd_router_t *router);
Modified: qpid/dispatch/trunk/src/server_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/server_private.h?rev=1585550&r1=1585549&r2=1585550&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/server_private.h (original)
+++ qpid/dispatch/trunk/src/server_private.h Mon Apr 7 18:42:08 2014
@@ -29,6 +29,7 @@
#include <proton/engine.h>
#include <proton/driver_extras.h>
+#include "dispatch_private.h"
#include "timer_private.h"
void qd_server_timer_pending_LH(qd_timer_t *timer);
Modified: qpid/dispatch/trunk/src/waypoint_private.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/waypoint_private.h?rev=1585550&r1=1585549&r2=1585550&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/waypoint_private.h (original)
+++ qpid/dispatch/trunk/src/waypoint_private.h Mon Apr 7 18:42:08 2014
@@ -21,11 +21,7 @@
#include <qpid/dispatch/server.h>
#include <qpid/dispatch/connection_manager.h>
-
-typedef struct qd_dispatch_t qd_dispatch_t;
-typedef struct qd_waypoint_t qd_waypoint_t;
-typedef struct qd_address_t qd_address_t;
-typedef struct qd_link_t qd_link_t;
+#include "dispatch_private.h"
void qd_waypoint_activate_all(qd_dispatch_t *qd);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org