From: Adam Emerson <aemerson@redhat.com>
Date: Wed, 27 Nov 2024 21:42:41 +0000 (-0500)
Subject: rgw: Fix deprecated amqp includes
X-Git-Tag: v20.3.0~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b3ae25786df8a0d15053db20ecdaca6f6cd111b;p=ceph.git

rgw: Fix deprecated amqp includes

Since we have an obscenely wide supported version spread, we have to
support the deprecated location, too.

Signed-off-by: Adam Emerson <aemerson@redhat.com>
---

diff --git a/src/rgw/rgw_amqp.cc b/src/rgw/rgw_amqp.cc
index 06688fdacc91..2121ac134f53 100644
--- a/src/rgw/rgw_amqp.cc
+++ b/src/rgw/rgw_amqp.cc
@@ -2,10 +2,17 @@
 // vim: ts=8 sw=2 smarttab ft=cpp
 
 #include "rgw_amqp.h"
+#if __has_include(<rabbitmq-c/amqp.h>)
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/ssl_socket.h>
+#include <rabbitmq-c/tcp_socket.h>
+#include <rabbitmq-c/framing.h>
+#else
 #include <amqp.h>
 #include <amqp_ssl_socket.h>
 #include <amqp_tcp_socket.h>
 #include <amqp_framing.h>
+#endif // __has_include(<rabbitmq-c/amqp.h>)
 #include "include/ceph_assert.h"
 #include <sstream>
 #include <cstring>
diff --git a/src/test/rgw/amqp_mock.cc b/src/test/rgw/amqp_mock.cc
index 8674e5026f68..2795106f18d9 100644
--- a/src/test/rgw/amqp_mock.cc
+++ b/src/test/rgw/amqp_mock.cc
@@ -2,9 +2,15 @@
 // vim: ts=8 sw=2 smarttab
 
 #include "amqp_mock.h"
+#if __has_include(<rabbitmq-c/amqp.h>)
+#include <rabbitmq-c/amqp.h>
+#include <rabbitmq-c/ssl_socket.h>
+#include <rabbitmq-c/tcp_socket.h>
+#else
 #include <amqp.h>
 #include <amqp_ssl_socket.h>
 #include <amqp_tcp_socket.h>
+#endif
 #include <string>
 #include <stdarg.h>
 #include <mutex>
diff --git a/src/test/rgw/amqp_url.c b/src/test/rgw/amqp_url.c
index 520e95c69d87..48dab5cb5162 100644
--- a/src/test/rgw/amqp_url.c
+++ b/src/test/rgw/amqp_url.c
@@ -40,7 +40,11 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "amqp.h"
+#if __has_include(<rabbitmq-c/amqp.h>)
+#include <rabbitmq-c/amqp.h>
+#else
+#include <amqp.h>
+#endif
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>