Author: tross
Date: Fri Jul 18 19:31:21 2014
New Revision: 1611777
URL: http://svn.apache.org/r1611777
Log:
NO-JIRA - Reduce the visibility of the type PyObject
Modified:
qpid/dispatch/trunk/src/dispatch.c
qpid/dispatch/trunk/src/dispatch_private.h
Modified: qpid/dispatch/trunk/src/dispatch.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/dispatch.c?rev=1611777&r1=1611776&r2=1611777&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/dispatch.c (original)
+++ qpid/dispatch/trunk/src/dispatch.c Fri Jul 18 19:31:21 2014
@@ -17,6 +17,7 @@
* under the License.
*/
+#include <Python.h>
#include <qpid/dispatch/python_embedded.h>
#include <qpid/dispatch.h>
#include <qpid/dispatch/server.h>
@@ -133,7 +134,7 @@ qd_error_t qd_dispatch_prepare(qd_dispat
return qd_error_code();
}
-void qd_dispatch_set_agent(qd_dispatch_t *qd, PyObject *agent) {
+void qd_dispatch_set_agent(qd_dispatch_t *qd, void *agent) {
assert(agent);
assert(!qd->py_agent);
qd->py_agent = agent;
@@ -147,7 +148,7 @@ void qd_dispatch_free(qd_dispatch_t *qd)
free(qd->router_area);
qd_connection_manager_free(qd->connection_manager);
qd_agent_free(qd->agent);
- Py_XDECREF(qd->py_agent);
+ Py_XDECREF((PyObject*) qd->py_agent);
qd_router_free(qd->router);
qd_container_free(qd->container);
qd_server_free(qd->server);
Modified: qpid/dispatch/trunk/src/dispatch_private.h
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/dispatch_private.h?rev=1611777&r1=1611776&r2=1611777&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/dispatch_private.h (original)
+++ qpid/dispatch/trunk/src/dispatch_private.h Fri Jul 18 19:31:21 2014
@@ -35,7 +35,6 @@ typedef struct qd_router_link_ref_t qd_r
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 _object PyObject;
#include <qpid/dispatch/container.h>
#include <qpid/dispatch/router.h>
@@ -48,7 +47,7 @@ struct qd_dispatch_t {
qd_container_t *container;
qd_router_t *router;
qd_agent_t *agent;
- PyObject *py_agent;
+ void *py_agent;
qd_connection_manager_t *connection_manager;
int thread_count;
@@ -58,6 +57,6 @@ struct qd_dispatch_t {
qd_router_mode_t router_mode;
};
-void qd_dispatch_set_agent(qd_dispatch_t *qd, PyObject *agent);
+void qd_dispatch_set_agent(qd_dispatch_t *qd, void *agent);
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
