1.1 --- a/epoc32/include/stdapis/sys/signal.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/sys/signal.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -42,7 +42,7 @@
     1.4  #include <sys/_types.h>
     1.5  #include <sys/_sigset.h>
     1.6  
     1.7 -#include <machine/signal.h>	/* sig_atomic_t; trap codes; sigcontext */
     1.8 +#include <stdapis/machine/signal.h>	/* sig_atomic_t; trap codes; sigcontext */
     1.9  
    1.10  /*
    1.11   * System defined signals.
    1.12 @@ -81,6 +81,8 @@
    1.13  #define	SIGUSR2		31	/* user defined signal 2 */
    1.14  #define	SIGTHR		32	/* Thread interrupt. */
    1.15  
    1.16 +#define SIGRTMIN	33
    1.17 +#define SIGRTMAX	64
    1.18  /*
    1.19   * XXX missing SIGRTMIN, SIGRTMAX.
    1.20   */
    1.21 @@ -88,6 +90,9 @@
    1.22  #define	SIG_DFL		((__sighandler_t *)0)
    1.23  #define	SIG_IGN		((__sighandler_t *)1)
    1.24  #define	SIG_ERR		((__sighandler_t *)-1)
    1.25 +#define	SIG_HOLD	((__sighandler_t *)3)
    1.26 +
    1.27 +
    1.28  /*
    1.29   * XXX missing SIG_HOLD.
    1.30   */
    1.31 @@ -110,30 +115,29 @@
    1.32   */
    1.33  typedef	void __sighandler_t(int);
    1.34  
    1.35 -#if __POSIX_VISIBLE || __XSI_VISIBLE
    1.36  #ifndef _SIGSET_T_DECLARED
    1.37  #define	_SIGSET_T_DECLARED
    1.38 -typedef	__sigset_t	sigset_t;
    1.39 -#endif
    1.40 +typedef	__uint64_t sigset_t;
    1.41  #endif
    1.42  
    1.43 -
    1.44  #if __POSIX_VISIBLE || __XSI_VISIBLE
    1.45 -struct __siginfo;
    1.46 +struct __siginfo_t;
    1.47  
    1.48  /*
    1.49   * Signal vector "template" used in sigaction call.
    1.50   */
    1.51  struct sigaction {
    1.52  	union {
    1.53 -		void    (*__sa_handler)(int);
    1.54 -		void    (*__sa_sigaction)(int, struct __siginfo *, void *);
    1.55 -	} __sigaction_u;		/* signal handler */
    1.56 +		void    (*_sa_handler)(int);
    1.57 +		void    (*_sa_sigaction)(int, struct __siginfo_t*, void *);
    1.58 +	} _sa_u;		/* signal handler */
    1.59  	int	sa_flags;		/* see signal options below */
    1.60  	sigset_t sa_mask;		/* signal mask to apply */
    1.61  };
    1.62  
    1.63 -#define	sa_handler	__sigaction_u.__sa_handler
    1.64 +#define	sa_handler		_sa_u._sa_handler
    1.65 +#define sa_sigaction 	_sa_u._sa_sigaction
    1.66 +
    1.67  #endif
    1.68  
    1.69  #if __POSIX_VISIBLE || __XSI_VISIBLE