X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/731a42d3aa2eae8a9656326bfe9c361d6ec25052..8267a61f91f5ed9e7368d3059e9d53b96cc8fcb7:/src/xbt/context_private.h

diff --git a/src/xbt/context_private.h b/src/xbt/context_private.h
index ad27b8de01..386497863c 100644
--- a/src/xbt/context_private.h
+++ b/src/xbt/context_private.h
@@ -13,48 +13,43 @@
 #include "xbt/swag.h"
 #include "xbt/dynar.h" /* void_f_pvoid_t */
 #include "portable.h"  /* loads context system definitions */
+
+#if !defined(_WIN32) && !defined(__WIN32__) && !defined(WIN32) && !defined(__TOS_WIN__)
 #include "ucontext_stack.h"  /* loads context system definitions */
+#endif
 
 #include "xbt/context.h"
 #include "xbt/ex.h"
 
-#ifdef S_SPLINT_S
-/* Dummy definition for splint since it chokes on ucontext.h */
-typedef struct ucontext {
-   struct ucontext *uc_link;
-   sigset_t uc_sigmask;
-   int uc_stack;
-   int uc_mcontext;
-} ucontext_t;
-typedef int CONTEXT;
-#endif 
-
-#ifdef USE_PTHREADS
-#  include <pthread.h>
+#ifdef CONTEXT_THREADS
+#  include "xbt/xbt_thread.h"
 #else
+#  include <ucontext.h>
 #  define STACK_SIZE 128*1024 /* Lower this if you want to reduce the memory consumption */
-#endif     /* USE_PTHREADS */
-
-typedef struct s_xbt_context {
-  s_xbt_swag_hookup_t hookup;
-#ifdef USE_PTHREADS
-  pthread_cond_t cond;
-  pthread_mutex_t mutex;
-  pthread_t *thread;		/* the thread that execute the code   */
+#endif     /* not CONTEXT_THREADS */
+
+
+typedef struct s_xbt_context 
+{
+	s_xbt_swag_hookup_t hookup;
+#ifdef CONTEXT_THREADS
+	xbt_thcond_t cond;
+	xbt_mutex_t mutex;
+	xbt_thread_t thread;		/* the thread that execute the code */
 #else
-  ucontext_t uc;                /* the thread that execute the code   */
-  char stack[STACK_SIZE];
-  struct s_xbt_context *save;
-#endif     /* USE_PTHREADS */
-  xbt_context_function_t code;	        /* the scheduler fonction   */
-  int argc;
-  char **argv;
-  void_f_pvoid_t *startup_func;
-  void *startup_arg;
-  void_f_pvoid_t *cleanup_func;
-  void *cleanup_arg;
-  ex_ctx_t *exception;	        /* exception */
+	ucontext_t uc;			/* the thread that execute the code */
+	char stack[STACK_SIZE];
+	struct s_xbt_context *save;
+#endif /* CONTEXT_THREADS */
+	xbt_context_function_t code;	/* the scheduler fonction	    */
+	int argc;
+	char **argv;
+	void_f_pvoid_t *startup_func;
+	void *startup_arg;
+	void_f_pvoid_t *cleanup_func;
+	void *cleanup_arg;
+	ex_ctx_t *exception;		/* exception 			    */
 } s_xbt_context_t;
-#else
 
-#endif              /* _XBT_CONTEXT_PRIVATE_H */
+
+#endif	/* !_XBT_CONTEXT_PRIVATE_H */