Author: gsim
Date: Fri Oct 10 12:53:51 2014
New Revision: 1630825
URL: http://svn.apache.org/r1630825
Log:
PROTON-???: Make previous changes compile under Windows
Modified:
qpid/proton/branches/examples/proton-c/bindings/python/cproton.i
qpid/proton/branches/examples/proton-c/src/windows/iocp.c
qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c
Modified: qpid/proton/branches/examples/proton-c/bindings/python/cproton.i
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/bindings/python/cproton.i?rev=1630825&r1=1630824&r2=1630825&view=diff
==============================================================================
--- qpid/proton/branches/examples/proton-c/bindings/python/cproton.i (original)
+++ qpid/proton/branches/examples/proton-c/bindings/python/cproton.i Fri Oct 10
12:53:51 2014
@@ -229,7 +229,7 @@ int pn_ssl_get_peer_hostname(pn_ssl_t *s
%immutable PN_PYREF;
%inline %{
- PN_EXTERN extern const pn_class_t *PN_PYREF;
+ extern const pn_class_t *PN_PYREF;
#define CID_pn_pyref CID_pn_void
#define pn_pyref_new NULL
@@ -256,8 +256,8 @@ int pn_ssl_get_peer_hostname(pn_ssl_t *s
return PN_PYREF;
}
- PN_EXTERN const pn_class_t PNI_PYREF = PN_METACLASS(pn_pyref);
- PN_EXTERN const pn_class_t *PN_PYREF = &PNI_PYREF;
+ const pn_class_t PNI_PYREF = PN_METACLASS(pn_pyref);
+ const pn_class_t *PN_PYREF = &PNI_PYREF;
void *pn_py2void(PyObject *object) {
return object;
Modified: qpid/proton/branches/examples/proton-c/src/windows/iocp.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/iocp.c?rev=1630825&r1=1630824&r2=1630825&view=diff
==============================================================================
--- qpid/proton/branches/examples/proton-c/src/windows/iocp.c (original)
+++ qpid/proton/branches/examples/proton-c/src/windows/iocp.c Fri Oct 10
12:53:51 2014
@@ -30,7 +30,7 @@
#include <Ws2tcpip.h>
#define PN_WINAPI
-#include "../platform.h"
+#include "platform.h"
#include <proton/object.h>
#include <proton/io.h>
#include <proton/selector.h>
@@ -205,6 +205,7 @@ static void pni_acceptor_finalize(void *
static pni_acceptor_t *pni_acceptor(iocpdesc_t *iocpd)
{
+ static const pn_cid_t CID_pni_acceptor = CID_pn_void;
static const pn_class_t clazz = PN_CLASS(pni_acceptor);
pni_acceptor_t *acceptor = (pni_acceptor_t *) pn_class_new(&clazz,
sizeof(pni_acceptor_t));
acceptor->listen_sock = iocpd;
@@ -363,6 +364,7 @@ static void connect_result_finalize(void
}
static connect_result_t *connect_result(iocpdesc_t *iocpd, struct addrinfo
*addr) {
+ static const pn_cid_t CID_connect_result = CID_pn_void;
static const pn_class_t clazz = PN_CLASS(connect_result);
connect_result_t *result = (connect_result_t *) pn_class_new(&clazz,
sizeof(connect_result_t));
if (result) {
@@ -729,6 +731,7 @@ static uintptr_t pni_iocpdesc_hashcode(v
// Reference counted in the iocpdesc map, zombie_list, selector.
static iocpdesc_t *pni_iocpdesc(pn_socket_t s)
{
+ static const pn_cid_t CID_pni_iocpdesc = CID_pn_void;
static pn_class_t clazz = PN_CLASS(pni_iocpdesc);
assert (s != INVALID_SOCKET);
iocpdesc_t *iocpd = (iocpdesc_t *) pn_class_new(&clazz, sizeof(iocpdesc_t));
@@ -1131,6 +1134,7 @@ void pni_iocp_finalize(void *obj)
iocp_t *pni_iocp()
{
+ static const pn_cid_t CID_pni_iocp = CID_pn_void;
static const pn_class_t clazz = PN_CLASS(pni_iocp);
iocp_t *iocp = (iocp_t *) pn_class_new(&clazz, sizeof(iocp_t));
return iocp;
Modified: qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c?rev=1630825&r1=1630824&r2=1630825&view=diff
==============================================================================
--- qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c
(original)
+++ qpid/proton/branches/examples/proton-c/src/windows/write_pipeline.c Fri Oct
10 12:53:51 2014
@@ -168,6 +168,7 @@ static void write_pipeline_finalize(void
write_pipeline_t *pni_write_pipeline(iocpdesc_t *iocpd)
{
+ static const pn_cid_t CID_write_pipeline = CID_pn_void;
static const pn_class_t clazz = PN_CLASS(write_pipeline);
write_pipeline_t *pipeline = (write_pipeline_t *) pn_class_new(&clazz,
sizeof(write_pipeline_t));
pipeline->iocpd = iocpd;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
