Files still broken, but at least in the right directory

[simgrid.git] / src / xbt / xbt_context_private.h

diff --git a/src/xbt/xbt_context_private.h b/src/xbt/xbt_context_private.h
index 5e061e4..b073653 100644 (file)
--- a/src/xbt/xbt_context_private.h
+++ b/src/xbt/xbt_context_private.h
@@ -2,7 +2,8 @@
 #define _XBT_CONTEXT_PRIVATE_H\r
 \r
 #include "xbt/sysdep.h"\r
-#include "xbt/xbt_context.h"\r
+#include "xbt/context.h"\r
+#include "xbt/swag.h"\r
 \r
 SG_BEGIN_DECL()\r
 \r
@@ -41,17 +42,22 @@ typedef struct s_xbt_context
        XBT_CTX_BASE_T;\r
 }s_xbt_context_t;\r
 \r
-SG_END_DECL()\r
-       \r
+/* Important guys */\r
+extern xbt_context_t current_context;\r
+extern xbt_context_t maestro_context;\r
+/* All dudes lists */\r
+extern xbt_swag_t context_living;\r
+extern xbt_swag_t context_to_destroy;\r
+\r
+\r
+/* All factories init */\r
+typedef struct s_xbt_context_factory* xbt_context_factory_t;\r
 \r
-#ifdef CONTEXT_THREADS\r
-#include "xbt_thread_context.h"        /* thread based context declarations            */\r
-#elif !defined(WIN32)\r
-#include "xbt_ucontext.h"              /* ucontext based context declarations          */\r
-#else\r
-#error ERROR [__FILE__, line __LINE__]: no context based implementation specified.\r
-#endif\r
+int xbt_thread_context_factory_init(xbt_context_factory_t* factory);\r
+int xbt_ucontext_factory_init(xbt_context_factory_t* factory);\r
+int xbt_jcontext_factory_init(xbt_context_factory_t* factory);\r
 \r
-#include "xbt_jcontext.h"              /* java thread based context declarations       */      \r
+\r
+SG_END_DECL()\r
 \r
 #endif /* !_XBT_CONTEXT_PRIVATE_H */\r