Skip to content

Commit 2d41f02

Browse files
committed
Refs #24021. Fixes
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 80d8fee commit 2d41f02

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

src/cpp/rtps/attributes/RTPSParticipantAttributes.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ static void setup_transports_shm(
191191
{
192192
#ifdef FASTDDS_SHM_TRANSPORT_DISABLED
193193
static_cast<void>(att);
194+
static_cast<void>(options);
194195
EPROSIMA_LOG_ERROR(RTPS_PARTICIPANT, "Trying to configure SHM transport only, " <<
195196
"but Fast DDS was built without SHM transport support.");
196197
#else
@@ -223,6 +224,7 @@ static void setup_large_data_shm_transport(
223224
{
224225
#ifdef FASTDDS_SHM_TRANSPORT_DISABLED
225226
static_cast<void>(att);
227+
static_cast<void>(options);
226228
EPROSIMA_LOG_ERROR(RTPS_PARTICIPANT, "Trying to configure Large Data transport, " <<
227229
"but Fast DDS was built without SHM transport support. Will use " <<
228230
"TCP for communications on the same host.");

src/cpp/security/artifact_providers/FileProvider.hpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,14 @@
2222
#include <functional>
2323
#include <string>
2424

25+
#if OPENSSL_VERSION_NUMBER < 0x30000000L
26+
#include <openssl/engine.h>
27+
#include <openssl/err.h>
28+
#include <openssl/ssl.h>
29+
#else
2530
#include <openssl/types.h>
31+
#endif // if OPENSSL_VERSION_NUMBER < 0x30000000L
32+
2633

2734
#include <rtps/security/exceptions/SecurityException.h>
2835

src/cpp/security/artifact_providers/Pkcs11Provider.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <openssl/conf.h>
3232
#include <openssl/err.h>
3333
#include <openssl/ssl.h>
34-
#include <openssl/types.h>
3534

3635
#if !defined(OPENSSL_NO_ENGINE)
3736
#include <openssl/engine.h>

src/cpp/security/artifact_providers/Pkcs11Provider.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@
2121

2222
#include <string>
2323

24+
#if OPENSSL_VERSION_NUMBER < 0x30000000L
25+
#include <openssl/engine.h>
26+
#include <openssl/err.h>
27+
#include <openssl/ssl.h>
28+
#else
2429
#include <openssl/types.h>
30+
#endif // if OPENSSL_VERSION_NUMBER < 0x30000000L
2531

2632
#include <rtps/security/exceptions/SecurityException.h>
2733

0 commit comments

Comments
 (0)