[CRIU] Re: [PATCH 1/2] types: use siginfo_t from signal.h for rt_signalfn_t declaration

Cyrill Gorcunov gorcunov at openvz.org
Wed Oct 17 13:51:29 EDT 2012


On Wed, Oct 17, 2012 at 09:47:43PM +0400, Cyrill Gorcunov wrote:
> 
> It should fit the sa_sigaction declaration, otherwise compiler
> complains about uncasted assignments.
> 
>  | restorer.c: In function ‘__export_restore_task’:
>  | restorer.c:318:20: error: assignment from incompatible pointer type [-Werror]
> 
> So just use siginfo_t here from the system signal.h header.
> 
> Signed-off-by: Andrew Grigorev <andrew at ei-grad.ru>
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---

Please pick this one instead, the Author header has escaped me.
-------------- next part --------------
>From c26474d601f92abd2d02667e3b2fb306ac864868 Mon Sep 17 00:00:00 2001
From: Andrew Grigorev <andrew at ei-grad.ru>
Date: Wed, 17 Oct 2012 20:32:42 +0400
Subject: [PATCH] types: use siginfo_t from signal.h for rt_signalfn_t
 declaration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It should fit the sa_sigaction declaration, otherwise compiler
complains about uncasted assignments.

 | restorer.c: In function ‘__export_restore_task’:
 | restorer.c:318:20: error: assignment from incompatible pointer type [-Werror]

So just use siginfo_t here from the system signal.h header.

Signed-off-by: Andrew Grigorev <andrew at ei-grad.ru>
Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 include/types.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/types.h b/include/types.h
index 32e398e..f996f75 100644
--- a/include/types.h
+++ b/include/types.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <signal.h>
 
 #include "bitops.h"
 
@@ -87,8 +88,7 @@ typedef struct {
 	unsigned long sig[1];
 } rt_sigset_t;
 
-struct siginfo;
-typedef void rt_signalfn_t(int, struct siginfo *, void *);
+typedef void rt_signalfn_t(int, siginfo_t *, void *);
 typedef rt_signalfn_t *rt_sighandler_t;
 
 typedef void rt_restorefn_t(void);
-- 
1.7.7.6



More information about the CRIU mailing list