Merge branch 'Adrien.Gougeon/simgrid-master'

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

diff --git a/include/xbt/log.h b/include/xbt/log.h
index d77ec59..6264c59 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -46,7 +46,7 @@ typedef enum {
   xbt_log_priority_trace = 1,          /**< enter and return of some functions */
   xbt_log_priority_debug = 2,          /**< crufty output  */
   xbt_log_priority_verbose = 3,        /**< verbose output for the user wanting more */
-  xbt_log_priority_info = 4,           /**< output about the regular functionning */
+  xbt_log_priority_info = 4,           /**< output about the regular functioning */
   xbt_log_priority_warning = 5,        /**< minor issue encountered */
   xbt_log_priority_error = 6,          /**< issue encountered */
   xbt_log_priority_critical = 7,       /**< major issue encountered */
@@ -104,6 +104,7 @@ typedef enum {
 #define XBT_LOG_NEW_SUBCATEGORY_helper(catName, parent, desc)                                                          \
   SG_BEGIN_DECL                                                                                                        \
   extern void _XBT_LOGV_CTOR(catName)(void) XBT_ATTRIB_CONSTRUCTOR(600);                                               \
+  SG_END_DECL                                                                                                          \
   void _XBT_LOGV_CTOR(catName)(void)                                                                                   \
   {                                                                                                                    \
     XBT_LOG_EXTERNAL_CATEGORY(catName);                                                                                \
@@ -111,7 +112,6 @@ typedef enum {
       _xbt_log_cat_init(&_XBT_LOGV(catName), xbt_log_priority_uninitialized);                                          \
     }                                                                                                                  \
   }                                                                                                                    \
-  SG_END_DECL                                                                                                          \
   XBT_EXPORT_NO_IMPORT s_xbt_log_category_t _XBT_LOGV(catName) = {                                                     \
       &_XBT_LOGV(parent),                                                                                              \
       NULL /* firstChild */,                                                                                           \
@@ -493,4 +493,4 @@ extern xbt_log_layout_t xbt_log_default_layout;
 #define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
 
 SG_END_DECL
-#endif                          /* ! _XBT_LOG_H_ */
+#endif /* XBT_LOG_H */