merge with git master

[simgrid.git] / src / include / xbt / context.h

diff --git a/src/include/xbt/context.h b/src/include/xbt/context.h
index 794ca39..aab0fc3 100644 (file)
--- a/src/include/xbt/context.h
+++ b/src/include/xbt/context.h
@@ -4,18 +4,18 @@
 #include "xbt/misc.h"                          /* XBT_PUBLIC(), SG_BEGIN_DECL() and SG_END_DECL() definitions  */\r
 #include "xbt/function_types.h"                /* function pointer types declarations                                                  */      \r
 #include "xbt_modinter.h"                      /* xbt_context_init() and xbt_context_exit() declarations               */\r
 #include "xbt/misc.h"                          /* XBT_PUBLIC(), SG_BEGIN_DECL() and SG_END_DECL() definitions  */\r
 #include "xbt/function_types.h"                /* function pointer types declarations                                                  */      \r
 #include "xbt_modinter.h"                      /* xbt_context_init() and xbt_context_exit() declarations               */\r

-     \rSG_BEGIN_DECL() \r \rtypedef struct s_xbt_context *xbt_context_t;
+     \rSG_BEGIN_DECL() \r \rtypedef struct s_xbt_context *xbt_context_t;\r

 \r\rXBT_PUBLIC(xbt_context_t) \r
 \r\rXBT_PUBLIC(xbt_context_t) \r

-xbt_context_new(const char *name, xbt_main_func_t code,
-                void_f_pvoid_t startup_func, void *startup_arg,
-                void_f_pvoid_t cleanup_func, void *cleanup_arg, int argc,
-                char *argv[]);
-\r\rXBT_PUBLIC(void) \r xbt_context_kill(xbt_context_t context);
-\r\rXBT_PUBLIC(void) \r xbt_context_start(xbt_context_t context);
-\r\rXBT_PUBLIC(void) \r xbt_context_yield(void);
-\r\rXBT_PUBLIC(void) \r xbt_context_schedule(xbt_context_t context);
-     \r\rvoid \rxbt_context_empty_trash(void);
-     \r\rvoid \rxbt_context_stop(int exit_code);
-     \r\rvoid \rxbt_context_free(xbt_context_t context);
+xbt_context_new(const char *name, xbt_main_func_t code,\r
+                void_f_pvoid_t startup_func, void *startup_arg,\r
+                void_f_pvoid_t cleanup_func, void *cleanup_arg, int argc,\r
+                char *argv[]);\r
+\r\rXBT_PUBLIC(void) \r xbt_context_kill(xbt_context_t context);\r
+\r\rXBT_PUBLIC(void) \r xbt_context_start(xbt_context_t context);\r
+\r\rXBT_PUBLIC(void) \r xbt_context_yield(void);\r
+\r\rXBT_PUBLIC(void) \r xbt_context_schedule(xbt_context_t context);\r
+     \r\rvoid \rxbt_context_empty_trash(void);\r
+     \r\rvoid \rxbt_context_stop(int exit_code);\r
+     \r\rvoid \rxbt_context_free(xbt_context_t context);\r

 \r\r\rSG_END_DECL() \r \r
 #endif  /* !XBT_CONTEXT_H */\r
 \r\r\rSG_END_DECL() \r \r
 #endif  /* !XBT_CONTEXT_H */\r