Bad idea to acquire a semaphore that is already hold. Split cleanup code from waiting...

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

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 70a41ba..7bc68a7 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. */
@@ -10,22 +10,13 @@
 #include "xbt/log.h"
 #include "xbt/swag.h"
 #include "private.h"
-#include <lua5.1/lauxlib.h>
 
+#ifdef HAVE_LUA
+#include <lauxlib.h>
+#endif
 
 #ifdef HAVE_RUBY
-/* Damn Ruby. They load their full config.h, which breaks since we also load ours.
- * So, we undef the offending defines
- */
-#undef PACKAGE_VERSION
-#undef PACKAGE_NAME
-#undef PACKAGE_TARNAME
-#undef PACKAGE_STRING
-#undef PACKAGE_BUGREPORT
-#undef _GNU_SOURCE
-#include <ruby.h>
  void SIMIX_ctx_ruby_factory_init(smx_context_factory_t *factory);
-#include "smx_context_ruby.c"
 #endif 
  
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mecanism");