no error checking were made for SIMIX_network_waitany, and cleanup were ... fragile

[simgrid.git] / src / simix / smx_context.c

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 71c2b0e..09c75b0 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -1,7 +1,7 @@
 /* a fast and simple context switching library                              */
 
-/* Copyright (c) 2004-2008 the SimGrid team.                                */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -12,7 +12,7 @@
 #include "private.h"
 
 #ifdef HAVE_LUA
-#include <lua5.1/lauxlib.h>
+#include <lauxlib.h>
 #endif
 
 #ifdef HAVE_RUBY
@@ -37,7 +37,7 @@ void SIMIX_context_mod_init(void)
 #ifdef CONTEXT_THREADS
     /* context switch based os thread */
     SIMIX_ctx_thread_factory_init(&simix_global->context_factory);
-#elif !defined(WIN32)
+#elif !defined(_XBT_WIN32)
     /* context switch based ucontext */
     SIMIX_ctx_sysv_factory_init(&simix_global->context_factory);
 #else
@@ -124,7 +124,7 @@ void SIMIX_context_init_factory_by_name(smx_context_factory_t * factory,
 #endif /* CONTEXT_THREADS */
    
     else if (!strcmp(name, "sysv"))
-  #if !defined(WIN32) && !defined(CONTEXT_THREADS)
+  #if !defined(_XBT_WIN32) && !defined(CONTEXT_THREADS)
       SIMIX_ctx_sysv_factory_init(factory);
   #else
       THROW0(not_found_error, 0, "Factory 'sysv' does not exist: no System V thread support under Windows");