From 218e4428411094ac785e00a719c7d84337dfdd1c Mon Sep 17 00:00:00 2001 From: bernie Date: Mon, 16 Jan 2006 03:27:49 +0000 Subject: [PATCH] Rename sig_t to sigbit_t to avoid clash with POSIX. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@464 38d2e660-2303-0410-9eaa-f027e97ec537 --- cfg/compiler.h | 5 ++++- mware/event.h | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cfg/compiler.h b/cfg/compiler.h index ddb270e1..bf9ae35c 100755 --- a/cfg/compiler.h +++ b/cfg/compiler.h @@ -14,6 +14,9 @@ /*#* *#* $Log$ + *#* Revision 1.8 2006/01/16 03:27:49 bernie + *#* Rename sig_t to sigbit_t to avoid clash with POSIX. + *#* *#* Revision 1.7 2005/11/27 23:33:05 bernie *#* Drop avr-libc hack for missing stdint.h. *#* @@ -358,7 +361,7 @@ typedef void * iptr_t; /*! Bulk storage large enough for both pointers to constants or integers. */ typedef const void * const_iptr_t; -typedef unsigned char sig_t; /*!< Type for signal bits. */ +typedef unsigned char sigbit_t; /*!< Type for signal bits. */ typedef unsigned char sigmask_t; /*!< Type for signal masks. */ typedef unsigned char page_t; /*!< Type for banked memory pages. */ diff --git a/mware/event.h b/mware/event.h index a0e8c75a..baa6493e 100755 --- a/mware/event.h +++ b/mware/event.h @@ -18,6 +18,9 @@ /*#* *#* $Log$ + *#* Revision 1.3 2006/01/16 03:27:49 bernie + *#* Rename sig_t to sigbit_t to avoid clash with POSIX. + *#* *#* Revision 1.2 2005/11/27 03:02:55 bernie *#* Convert to appconfig.h. *#* @@ -84,7 +87,7 @@ typedef struct Event struct { struct Process *sig_proc; /* Process to be signalled */ - sig_t sig_bit; /* Signal to send */ + sigbit_t sig_bit; /* Signal to send */ } Sig; #endif struct @@ -117,7 +120,7 @@ INLINE Event event_createNone(void) ((e)->action = event_hook_softint,(e)->Ev.Int.func = (f), (e)->Ev.Int.user_data = (u)) /*! Same as event_initSoftInt(), but returns the initialized event */ -INLINE Event event_createSoftInt(Hook func, void* user_data) +INLINE Event event_createSoftInt(Hook func, void *user_data) { Event e; e.action = event_hook_softint; @@ -134,7 +137,7 @@ INLINE Event event_createSoftInt(Hook func, void* user_data) ((e)->action = event_hook_signal,(e)->Ev.Sig.sig_proc = (p), (e)->Ev.Sig.sig_bit = (s)) /*! Same as event_initSignal(), but returns the initialized event */ -INLINE Event event_createSignal(struct Process* proc, sig_t bit) +INLINE Event event_createSignal(struct Process *proc, sigbit_t bit) { Event e; e.action = event_hook_signal; @@ -146,7 +149,7 @@ INLINE Event event_createSignal(struct Process* proc, sig_t bit) #endif /*! Trigger an event */ -INLINE void event_do(struct Event* e) +INLINE void event_do(struct Event *e) { e->action(e); } -- 2.25.1