From: cristianrosa Date: Thu, 2 Dec 2010 20:53:19 +0000 (+0000) Subject: Compile fix X-Git-Tag: v3.6_beta2~989 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/de7d161240f434a809ae7739fbb15a1db6ab86f2?ds=sidebyside Compile fix git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8926 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/bindings/ruby/simgrid_ruby.c b/src/bindings/ruby/simgrid_ruby.c index f6bccc573b..d6c5338185 100644 --- a/src/bindings/ruby/simgrid_ruby.c +++ b/src/bindings/ruby/simgrid_ruby.c @@ -8,7 +8,6 @@ #include "xbt.h" #include "bindings/ruby_bindings.h" -#include "simix/smx_context_private.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ruby); diff --git a/src/bindings/ruby_bindings.h b/src/bindings/ruby_bindings.h index b5be7a7a15..965d36bec5 100644 --- a/src/bindings/ruby_bindings.h +++ b/src/bindings/ruby_bindings.h @@ -27,7 +27,7 @@ #include "xbt/log.h" #include "xbt/asserts.h" -#include "bindings/smx_context.h" +#include "simix/context.h" /* Damn Ruby. They load their full config.h, which breaks since we also load ours. * So, we undef the offending defines diff --git a/src/simix/smx_context_ruby.c b/src/simix/smx_context_ruby.c index 27e84c114e..295accd9cd 100644 --- a/src/simix/smx_context_ruby.c +++ b/src/simix/smx_context_ruby.c @@ -11,7 +11,6 @@ #include "xbt/log.h" #include "xbt/asserts.h" -#include "bindings/smx_context.h" #include "bindings/ruby_bindings.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ruby); diff --git a/src/simix/smx_context_thread.c b/src/simix/smx_context_thread.c index d5c48954dd..64705e3dc7 100644 --- a/src/simix/smx_context_thread.c +++ b/src/simix/smx_context_thread.c @@ -12,7 +12,7 @@ #include "xbt/swag.h" #include "xbt/xbt_os_thread.h" #include "xbt_modinter.h" /* prototype of os thread module's init/exit in XBT */ -#include "simix/smx_context_private.h" +#include "simix/context.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);