1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
From e7699fb159dca1d68d419255acee4ea9f532bfa2 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 18 Sep 2015 11:38:15 +0200
Subject: [PATCH] fix build with librabbitmq 0.5, fix #177
---
amqp.c | 4 ++++
amqp_connection.c | 4 ++++
amqp_connection.h | 4 +++-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/amqp.c b/amqp.c
index 4c8769b..087e5cd 100644
--- a/amqp.c
+++ b/amqp.c
@@ -493,6 +493,10 @@ zend_function_entry amqp_connection_class_functions[] = {
PHP_ME(amqp_connection_class, getUsedChannels, arginfo_amqp_connection_class_getUsedChannels, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, getMaxChannels, arginfo_amqp_connection_class_getMaxChannels, ZEND_ACC_PUBLIC)
PHP_ME(amqp_connection_class, isPersistent, arginfo_amqp_connection_class_isPersistent, ZEND_ACC_PUBLIC)
+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
+ PHP_ME(amqp_connection_class, getHeartbeatInterval, arginfo_amqp_connection_class_getHeartbeatInterval, ZEND_ACC_PUBLIC)
+ PHP_ME(amqp_connection_class, getMaxFrameSize, arginfo_amqp_connection_class_getMaxFrameSize, ZEND_ACC_PUBLIC)
+#endif
{NULL, NULL, NULL} /* Must be the last line in amqp_functions[] */
};
diff --git a/amqp_connection.c b/amqp_connection.c
index cae9c12..f65fe3b 100644
--- a/amqp_connection.c
+++ b/amqp_connection.c
@@ -141,6 +141,7 @@ HashTable *amqp_connection_object_get_debug_info(zval *object, int *is_temp TSRM
}
zend_hash_add(debug_info, "max_channel_id", sizeof("max_channel_id"), &value, sizeof(zval *), NULL);
+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
MAKE_STD_ZVAL(value);
if (connection->connection_resource) {
ZVAL_LONG(value, amqp_get_frame_max(connection->connection_resource->connection_state));
@@ -156,6 +157,7 @@ HashTable *amqp_connection_object_get_debug_info(zval *object, int *is_temp TSRM
ZVAL_NULL(value);
}
zend_hash_add(debug_info, "heartbeat_interval", sizeof("heartbeat_interval"), &value, sizeof(zval *), NULL);
+#endif
/* Start adding values */
return debug_info;
@@ -1361,6 +1363,7 @@ PHP_METHOD(amqp_connection_class, getMaxChannels)
}
/* }}} */
+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
/* {{{ proto amqp::getMaxFrameSize()
Get max supported frame size per connection in bytes */
PHP_METHOD(amqp_connection_class, getMaxFrameSize)
@@ -1408,6 +1411,7 @@ PHP_METHOD(amqp_connection_class, getHeartbeatInterval)
RETURN_LONG(amqp_get_heartbeat(connection->connection_resource->connection_state));
}
/* }}} */
+#endif
/* {{{ proto amqp::isPersistent()
check whether amqp connection is persistent */
diff --git a/amqp_connection.h b/amqp_connection.h
index 277e5ff..2c6ef92 100644
--- a/amqp_connection.h
+++ b/amqp_connection.h
@@ -68,9 +68,11 @@ PHP_METHOD(amqp_connection_class, getWriteTimeout);
PHP_METHOD(amqp_connection_class, setWriteTimeout);
PHP_METHOD(amqp_connection_class, getUsedChannels);
-PHP_METHOD(amqp_connection_class, getMaxFrameSize);
PHP_METHOD(amqp_connection_class, getMaxChannels);
+#if AMQP_VERSION_MAJOR * 100 + AMQP_VERSION_MINOR * 10 + AMQP_VERSION_PATCH > 52
PHP_METHOD(amqp_connection_class, getHeartbeatInterval);
+PHP_METHOD(amqp_connection_class, getMaxFrameSize);
+#endif
PHP_METHOD(amqp_connection_class, isPersistent);
/*
|
