From 11d16f4ee43b65dce8daa4025e05116e9158e2c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3n=20Casas?= Date: Tue, 11 Mar 2025 07:54:08 +0100 Subject: [PATCH 1/2] exclude rcl_validate_enclave_name and rcl_get_security_options_from_environment from micro-ROS (#24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antón Casas (cherry picked from commit 7fbf5b9c5b7ab0ccd8f709bcdda4a451c136f4cd) # Conflicts: # rcl/src/rcl/init.c --- rcl/src/rcl/init.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c index c953ff076..5f6912e5a 100644 --- a/rcl/src/rcl/init.c +++ b/rcl/src/rcl/init.c @@ -185,7 +185,10 @@ rcl_init( fail_ret = RCL_RET_BAD_ALLOC; goto fail; } +<<<<<<< HEAD #endif //RCL_COMMAND_LINE_ENABLED +======= +>>>>>>> 7fbf5b9 (exclude rcl_validate_enclave_name and rcl_get_security_options_from_environment from micro-ROS (#24)) int validation_result; size_t invalid_index; @@ -217,6 +220,7 @@ rcl_init( fail_ret = ret; goto fail; } +#endif //RCL_MICROROS // Initialize rmw_init. rmw_ret_t rmw_ret = rmw_init( From 99569cf597bc8ef6dbf783066959ee2f102d49b7 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Fri, 14 Mar 2025 07:48:45 +0100 Subject: [PATCH 2/2] Fix conflicts --- rcl/src/rcl/init.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c index 5f6912e5a..8b905d0dd 100644 --- a/rcl/src/rcl/init.c +++ b/rcl/src/rcl/init.c @@ -185,10 +185,6 @@ rcl_init( fail_ret = RCL_RET_BAD_ALLOC; goto fail; } -<<<<<<< HEAD -#endif //RCL_COMMAND_LINE_ENABLED -======= ->>>>>>> 7fbf5b9 (exclude rcl_validate_enclave_name and rcl_get_security_options_from_environment from micro-ROS (#24)) int validation_result; size_t invalid_index; @@ -220,7 +216,7 @@ rcl_init( fail_ret = ret; goto fail; } -#endif //RCL_MICROROS +#endif //RCL_COMMAND_LINE_ENABLED // Initialize rmw_init. rmw_ret_t rmw_ret = rmw_init(