From 6a324b8bb94a6ce657e075b7f534696a5c43adc1 Mon Sep 17 00:00:00 2001
From: "Huang weiliang(weller)" <weller.huang@us.bosch.com>
Date: Mon, 3 Jun 2024 22:37:54 +0000
Subject: [PATCH] Support platform QNX OS

Compile with SDP7.1:
./configure --cc=aarch64-unknown-nto-qnx7.1.0-gcc --disable-shm
make

Function is verfied by UFS device read and write test.
---
 server.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server.c b/server.c
index 2d9121952..f1b848be0 100644
--- a/server.c
+++ b/server.c
@@ -2743,9 +2743,15 @@ static void set_sig_handlers(void)
 	struct sigaction act = {
 		.sa_handler = sig_int,
 		#if defined(__QNX__)
+<<<<<<< HEAD
 		act.sa_flags = SA_NOCLDSTOP,
 		#else
 		act.sa_flags = SA_RESTART,
+=======
+		.sa_flags = SA_NOCLDSTOP,
+		#else
+		.sa_flags = SA_RESTART,
+>>>>>>> Support platform QNX OS
 		#endif
 	};