Move official includes to rabbitmq-c/ directory

Move official rabbitmq-c includes under the rabbitmq-c, thus new programs should use the following include paths: amqp.h -> rabbitmq-c/amqp.h amqp_tcp_socket.h -> rabbitmq-c/tcp_socket.h amqp_ssl_socket .h-> rabbitmq-c/ssl_socket.h amqp_framing.h -> rabbitmq-c/framing.h Existing include files are left with a warning message and including their new equivalents, so existing programs should compile without modification. Signed-off-by: GitHub <noreply@github.com>
alanxz · Apr 6, 2021 · c8c1170 · c8c1170
1 parent 5a75fbe
commit c8c1170
Show file tree

Hide file tree

Showing 35 changed files with 4,123 additions and 3,954 deletions.
diff --git a/cmake/VersionFunctions.cmake b/cmake/VersionFunctions.cmake
@@ -1,7 +1,7 @@
 function(get_library_version VERSION_ARG)
-    file(STRINGS include/amqp.h _API_VERSION_MAJOR REGEX "^#define AMQP_VERSION_MAJOR [0-9]+$")
-    file(STRINGS include/amqp.h _API_VERSION_MINOR REGEX "^#define AMQP_VERSION_MINOR [0-9]+$")
-    file(STRINGS include/amqp.h _API_VERSION_PATCH REGEX "^#define AMQP_VERSION_PATCH [0-9]+$")
+    file(STRINGS include/rabbitmq-c/amqp.h _API_VERSION_MAJOR REGEX "^#define AMQP_VERSION_MAJOR [0-9]+$")
+    file(STRINGS include/rabbitmq-c/amqp.h _API_VERSION_MINOR REGEX "^#define AMQP_VERSION_MINOR [0-9]+$")
+    file(STRINGS include/rabbitmq-c/amqp.h _API_VERSION_PATCH REGEX "^#define AMQP_VERSION_PATCH [0-9]+$")
 
     string(REGEX MATCH "[0-9]+" _API_VERSION_MAJOR ${_API_VERSION_MAJOR})
     string(REGEX MATCH "[0-9]+" _API_VERSION_MINOR ${_API_VERSION_MINOR})

diff --git a/examples/amqp_bind.c b/examples/amqp_bind.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include "utils.h"
 

diff --git a/examples/amqp_connect_timeout.c b/examples/amqp_connect_timeout.c
@@ -41,8 +41,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include <assert.h>
 

diff --git a/examples/amqp_consumer.c b/examples/amqp_consumer.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include <assert.h>
 

diff --git a/examples/amqp_exchange_declare.c b/examples/amqp_exchange_declare.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include "utils.h"
 

diff --git a/examples/amqp_listen.c b/examples/amqp_listen.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include <assert.h>
 

diff --git a/examples/amqp_listenq.c b/examples/amqp_listenq.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include <assert.h>
 

diff --git a/examples/amqp_producer.c b/examples/amqp_producer.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include "utils.h"
 

diff --git a/examples/amqp_rpc_sendstring_client.c b/examples/amqp_rpc_sendstring_client.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include <assert.h>
 

diff --git a/examples/amqp_sendstring.c b/examples/amqp_sendstring.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include "utils.h"
 

diff --git a/examples/amqp_ssl_connect.c b/examples/amqp_ssl_connect.c
@@ -44,8 +44,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_ssl_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/ssl_socket.h>
 
 #include <assert.h>
 

diff --git a/examples/amqp_unbind.c b/examples/amqp_unbind.c
@@ -38,8 +38,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_tcp_socket.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/tcp_socket.h>
 
 #include "utils.h"
 

diff --git a/examples/utils.c b/examples/utils.c
@@ -39,8 +39,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <amqp.h>
-#include <amqp_framing.h>
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/framing.h>
 #include <stdint.h>
 
 #include "utils.h"