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 2013/04/18 18:11:55 UTC
svn commit: r1469399 - in /qpid/proton/trunk/proton-c:
include/proton/cproton.i src/posix/driver.c src/windows/driver.c
Author: tross
Date: Thu Apr 18 16:11:54 2013
New Revision: 1469399
URL: http://svn.apache.org/r1469399
Log:
PROTON-297 - Fixed mismatched type for timestamps.
Based on a patch from Jin.
Modified:
qpid/proton/trunk/proton-c/include/proton/cproton.i
qpid/proton/trunk/proton-c/src/posix/driver.c
qpid/proton/trunk/proton-c/src/windows/driver.c
Modified: qpid/proton/trunk/proton-c/include/proton/cproton.i
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/cproton.i?rev=1469399&r1=1469398&r2=1469399&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/cproton.i (original)
+++ qpid/proton/trunk/proton-c/include/proton/cproton.i Thu Apr 18 16:11:54 2013
@@ -259,7 +259,7 @@ typedef long long int int64_t;
transport != NULL;
}
-#%contract pn_transport_tick(pn_transport_t *transport, time_t now)
+#%contract pn_transport_tick(pn_transport_t *transport, pn_timestamp_t now)
#{
# # this method currently always returns 0
#}
Modified: qpid/proton/trunk/proton-c/src/posix/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/posix/driver.c?rev=1469399&r1=1469398&r2=1469399&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/posix/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/posix/driver.c Thu Apr 18 16:11:54 2013
@@ -522,7 +522,7 @@ bool pn_connector_activated(pn_connector
return result;
}
-static pn_timestamp_t pn_connector_tick(pn_connector_t *ctor, time_t now)
+static pn_timestamp_t pn_connector_tick(pn_connector_t *ctor, pn_timestamp_t now)
{
if (!ctor->transport) return 0;
return pn_transport_tick(ctor->transport, now);
Modified: qpid/proton/trunk/proton-c/src/windows/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/windows/driver.c?rev=1469399&r1=1469398&r2=1469399&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/windows/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/windows/driver.c Thu Apr 18 16:11:54 2013
@@ -567,7 +567,7 @@ bool pn_connector_activated(pn_connector
return result;
}
-static pn_timestamp_t pn_connector_tick(pn_connector_t *ctor, time_t now)
+static pn_timestamp_t pn_connector_tick(pn_connector_t *ctor, pn_timestamp_t now)
{
if (!ctor->transport) return 0;
return pn_transport_tick(ctor->transport, now);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org