Module: xenomai-jki
Branch: for-upstream
Commit: bb1599d4ada7f12af60acea799ac548d879c3f4a
URL:    
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=bb1599d4ada7f12af60acea799ac548d879c3f4a

Author: Jan Kiszka <jan.kis...@siemens.com>
Date:   Wed Sep  1 17:39:47 2010 +0200

Avoid use of "panic" in xnpod_fatal macro

We want to call the kernel function panic() from xnarch_halt() soon, so
this variable will cause a conflict.

Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>

---

 include/nucleus/types.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/nucleus/types.h b/include/nucleus/types.h
index f49131c..00762eb 100644
--- a/include/nucleus/types.h
+++ b/include/nucleus/types.h
@@ -142,10 +142,10 @@ void __xeno_user_exit(void);
 
 #define xnpod_fatal(format,args...) \
 do { \
-    const char *panic; \
-    xnarch_trace_panic_freeze(); \
-    panic = xnpod_fatal_helper(format,##args); \
-    xnarch_halt(panic); \
+       const char *__panic_msg; \
+       xnarch_trace_panic_freeze(); \
+       __panic_msg = xnpod_fatal_helper(format,##args); \
+       xnarch_halt(__panic_msg); \
 } while (0)
 
 #ifdef __XENO_SIM__


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to