Skip to content

Commit 6ece550

Browse files
committed
Cast time_t since some "dtrace -G" invocations fail on time_t arguments
1 parent 8a0ae67 commit 6ece550

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ext/oci8/oci8.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2783,7 +2783,7 @@ static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC)
27832783
if (!connection->used_this_request && OCI_G(persistent_timeout) != -1) {
27842784
#ifdef HAVE_OCI8_DTRACE
27852785
if (DTRACE_OCI8_CONNECT_EXPIRY_ENABLED()) {
2786-
DTRACE_OCI8_CONNECT_EXPIRY(connection, connection->is_stub ? 1 : 0, connection->idle_expiry, timestamp);
2786+
DTRACE_OCI8_CONNECT_EXPIRY(connection, connection->is_stub ? 1 : 0, (long)connection->idle_expiry, (long)timestamp);
27872787
}
27882788
#endif /* HAVE_OCI8_DTRACE */
27892789
if (connection->idle_expiry < timestamp) {

ext/oci8/oci8_dtrace.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ provider php {
2727
probe oci8__connect__p__dtor__close(void *connection);
2828
probe oci8__connect__p__dtor__release(void *connection);
2929
probe oci8__connect__lookup(void *connection, int is_stub);
30-
probe oci8__connect__expiry(void *connection, int is_stub, time_t idle_expiry, time_t timestamp);
30+
probe oci8__connect__expiry(void *connection, int is_stub, long idle_expiry, long timestamp);
3131
probe oci8__connect__type(int persistent, int exclusive, void *connection, long num_persistent, long num_connections);
3232
probe oci8__sesspool__create(void *session_pool);
3333
probe oci8__sesspool__stats(unsigned long free, unsigned long busy, unsigned long open);

ext/oci8/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
4040
<active>no</active>
4141
</lead>
4242

43-
<date>2013-08-30</date>
43+
<date>2013-09-03</date>
4444
<time>12:00:00</time>
4545

4646
<version>

0 commit comments

Comments
 (0)