Remove include of <stdnoreturn.h>
<stdnoreturn.h> defines the macro 'noreturn',
which breaks uses of __attribute__((noreturn))
in the code.
This particular issue is triggered when updating
fmtlib to v10.1.1
Bug: 310046696
Test: mmm packages/modules/Virtualization
Change-Id: I427a0f53a1619ff19323f481f4f6fa8f0f4899fd
diff --git a/compos/src/compsvc_main.rs b/compos/src/compsvc_main.rs
index b0fc323..128d581 100644
--- a/compos/src/compsvc_main.rs
+++ b/compos/src/compsvc_main.rs
@@ -54,10 +54,7 @@
// SAFETY: We hold a strong pointer, so the raw pointer remains valid. The bindgen AIBinder
// is the same type as sys::AIBinder. It is safe for on_ready to be invoked at any time, with
// any parameter.
- unsafe {
- AVmPayload_runVsockRpcServer(service, COMPOS_VSOCK_PORT, Some(on_ready), param);
- }
- Ok(())
+ unsafe { AVmPayload_runVsockRpcServer(service, COMPOS_VSOCK_PORT, Some(on_ready), param) }
}
extern "C" fn on_ready(_param: *mut c_void) {
diff --git a/vm_payload/include/vm_payload.h b/vm_payload/include/vm_payload.h
index c28cd42..a1a2627 100644
--- a/vm_payload/include/vm_payload.h
+++ b/vm_payload/include/vm_payload.h
@@ -19,7 +19,6 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
-#include <stdnoreturn.h>
#include <sys/cdefs.h>
#include "vm_main.h"
@@ -57,9 +56,9 @@
* callback will be called at most once.
* \param param parameter to be passed to the `on_ready` callback.
*/
-noreturn void AVmPayload_runVsockRpcServer(AIBinder* _Nonnull service, uint32_t port,
- void (*_Nullable on_ready)(void* _Nullable param),
- void* _Nullable param);
+__attribute__((noreturn)) void AVmPayload_runVsockRpcServer(
+ AIBinder* _Nonnull service, uint32_t port,
+ void (*_Nullable on_ready)(void* _Nullable param), void* _Nullable param);
/**
* Returns all or part of a 32-byte secret that is bound to this unique VM