From 8e8f6b7b353e554dbb8dd1846650a9e063ebc361 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 3 Nov 2015 15:41:13 +0100
Subject: php-pecl-amqp: 1.6.0 (stable)

---
 amqp-178.patch | 79 ----------------------------------------------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 amqp-178.patch

(limited to 'amqp-178.patch')

diff --git a/amqp-178.patch b/amqp-178.patch
deleted file mode 100644
index 493be50..0000000
--- a/amqp-178.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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);
- 
- /*
-- 
cgit