Fix prototype, and use boolean operators.

[simgrid.git] / include / xbt / ex.h

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 0cbbb9d..bb9ff8f 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -16,12 +16,12 @@
 /** @addtogroup XBT_ex_c
  *  @brief Exceptions support (C)
  *
- *  Those fonctions are used to throw C++ exceptions from C code. This feature
+ *  Those functions are used to throw C++ exceptions from C code. This feature
  *  should probably be removed in the future because C and exception do not
  *  exactly play nicely together.
  */
 
-SG_BEGIN_DECL()
+SG_BEGIN_DECL
 
 /** Helper function used to throw exceptions in C */
 XBT_ATTRIB_NORETURN XBT_PUBLIC void _xbt_throw(char* message, int value, const char* file, int line, const char* func);
@@ -30,13 +30,13 @@ XBT_ATTRIB_NORETURN XBT_PUBLIC void _xbt_throw(char* message, int value, const c
  *  @ingroup XBT_ex_c
  *  @hideinitializer
  */
-#define THROW(v) _xbt_throw(NULL, v, __FILE__, __LINE__, __func__)
+#define THROW(v) _xbt_throw(NULL, (v), __FILE__, __LINE__, __func__)
 
 /** Builds and throws an exception with a printf-like formatted message
  *  @ingroup XBT_ex_c
  *  @hideinitializer
  */
-#define THROWF(v, ...) _xbt_throw(bprintf(__VA_ARGS__), v, __FILE__, __LINE__, __func__)
+#define THROWF(v, ...) _xbt_throw(bprintf(__VA_ARGS__), (v), __FILE__, __LINE__, __func__)
 
 XBT_ATTRIB_NORETURN void xbt_throw_impossible(const char* file, int line, const char* func);
 /** Throw an exception because something impossible happened
@@ -55,7 +55,7 @@ XBT_ATTRIB_NORETURN XBT_PUBLIC void xbt_throw_unimplemented(const char* file, in
  */
 #define DIE_IMPOSSIBLE xbt_die("The Impossible Did Happen (yet again)")
 
-SG_END_DECL()
+SG_END_DECL
 
 /** @} */
 #endif                          /* __XBT_EX_H__ */