Eliminate the AMQP_EMPTY_* macros from amqp.h

Hooray, amqp.h is now ISO C90 clean.

6 files changed, 12 insertions, 12 deletions

diff --git a/examples/amqp_bind.c b/examples/amqp_bind.c
index 1f183a5..8ffda3f 100644
--- a/examples/amqp_bind.c
+++ b/examples/amqp_bind.c
@@ -94,7 +94,7 @@ int main(int argc, char const * const *argv) {
 		  amqp_cstring_bytes(queue),
 		  amqp_cstring_bytes(exchange),
 		  amqp_cstring_bytes(bindingkey),
-		  AMQP_EMPTY_TABLE);
+		  amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Unbinding");
 
   die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel");
diff --git a/examples/amqp_consumer.c b/examples/amqp_consumer.c
index 9341823..2a0d9b9 100644
--- a/examples/amqp_consumer.c
+++ b/examples/amqp_consumer.c
@@ -163,8 +163,8 @@ int main(int argc, char const * const *argv) {
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel");
 
   {
-    amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, AMQP_EMPTY_BYTES, 0, 0, 0, 1,
-						    AMQP_EMPTY_TABLE);
+    amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1,
+						    amqp_empty_table);
     die_on_amqp_error(amqp_get_rpc_reply(conn), "Declaring queue");
     queuename = amqp_bytes_malloc_dup(r->queue);
     if (queuename.bytes == NULL) {
@@ -174,10 +174,10 @@ int main(int argc, char const * const *argv) {
   }
 
   amqp_queue_bind(conn, 1, queuename, amqp_cstring_bytes(exchange), amqp_cstring_bytes(bindingkey),
-		  AMQP_EMPTY_TABLE);
+		  amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Binding queue");
 
-  amqp_basic_consume(conn, 1, queuename, AMQP_EMPTY_BYTES, 0, 1, 0, AMQP_EMPTY_TABLE);
+  amqp_basic_consume(conn, 1, queuename, amqp_empty_bytes, 0, 1, 0, amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Consuming");
 
   run(conn);
diff --git a/examples/amqp_exchange_declare.c b/examples/amqp_exchange_declare.c
index e77ac52..b4b28ad 100644
--- a/examples/amqp_exchange_declare.c
+++ b/examples/amqp_exchange_declare.c
@@ -89,7 +89,7 @@ int main(int argc, char const * const *argv) {
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel");
 
   amqp_exchange_declare(conn, 1, amqp_cstring_bytes(exchange), amqp_cstring_bytes(exchangetype),
-			0, 0, AMQP_EMPTY_TABLE);
+			0, 0, amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Declaring exchange");
 
   die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel");
diff --git a/examples/amqp_listen.c b/examples/amqp_listen.c
index f208652..7fd5af2 100644
--- a/examples/amqp_listen.c
+++ b/examples/amqp_listen.c
@@ -95,8 +95,8 @@ int main(int argc, char const * const *argv) {
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel");
 
   {
-    amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, AMQP_EMPTY_BYTES, 0, 0, 0, 1,
-						    AMQP_EMPTY_TABLE);
+    amqp_queue_declare_ok_t *r = amqp_queue_declare(conn, 1, amqp_empty_bytes, 0, 0, 0, 1,
+						    amqp_empty_table);
     die_on_amqp_error(amqp_get_rpc_reply(conn), "Declaring queue");
     queuename = amqp_bytes_malloc_dup(r->queue);
     if (queuename.bytes == NULL) {
@@ -106,10 +106,10 @@ int main(int argc, char const * const *argv) {
   }
 
   amqp_queue_bind(conn, 1, queuename, amqp_cstring_bytes(exchange), amqp_cstring_bytes(bindingkey),
-		  AMQP_EMPTY_TABLE);
+		  amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Binding queue");
 
-  amqp_basic_consume(conn, 1, queuename, AMQP_EMPTY_BYTES, 0, 1, 0, AMQP_EMPTY_TABLE);
+  amqp_basic_consume(conn, 1, queuename, amqp_empty_bytes, 0, 1, 0, amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Consuming");
 
   {
diff --git a/examples/amqp_listenq.c b/examples/amqp_listenq.c
index 98c389f..18489da 100644
--- a/examples/amqp_listenq.c
+++ b/examples/amqp_listenq.c
@@ -90,7 +90,7 @@ int main(int argc, char const * const *argv) {
   amqp_channel_open(conn, 1);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Opening channel");
 
-  amqp_basic_consume(conn, 1, amqp_cstring_bytes(queuename), AMQP_EMPTY_BYTES, 0, 0, 0, AMQP_EMPTY_TABLE);
+  amqp_basic_consume(conn, 1, amqp_cstring_bytes(queuename), amqp_empty_bytes, 0, 0, 0, amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Consuming");
 
   {
diff --git a/examples/amqp_unbind.c b/examples/amqp_unbind.c
index 4b92e12..b014067 100644
--- a/examples/amqp_unbind.c
+++ b/examples/amqp_unbind.c
@@ -94,7 +94,7 @@ int main(int argc, char const * const *argv) {
 		    amqp_cstring_bytes(queue),
 		    amqp_cstring_bytes(exchange),
 		    amqp_cstring_bytes(bindingkey),
-		    AMQP_EMPTY_TABLE);
+		    amqp_empty_table);
   die_on_amqp_error(amqp_get_rpc_reply(conn), "Unbinding");
 
   die_on_amqp_error(amqp_channel_close(conn, 1, AMQP_REPLY_SUCCESS), "Closing channel");