From: mquinson Date: Thu, 2 Dec 2010 18:04:33 +0000 (+0000) Subject: smx_context.h must be installed so that I can write binding packages X-Git-Tag: v3.6_beta2~996 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ddb9b227cc31cdf0f74b65b9c0312fd416417c57?ds=sidebyside smx_context.h must be installed so that I can write binding packages git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8919 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 009dbc97f0..7e3677ac84 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -82,7 +82,6 @@ set(EXTRA_DIST src/amok/Bandwidth/bandwidth_private.h src/amok/amok_modinter.h src/simix/private.h - src/simix/smx_context_private.h src/smpi/private.h src/smpi/smpi_coll_private.h src/smpi/smpi_mpi_dt_private.h @@ -389,6 +388,7 @@ set(install_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h include/gras.h include/xbt.h + include/bindings/smx_context.h ) ### depend of some variables setted upper diff --git a/src/simix/smx_context_private.h b/include/bindings/smx_context.h similarity index 94% rename from src/simix/smx_context_private.h rename to include/bindings/smx_context.h index bf2d95f3af..4c9cacf490 100644 --- a/src/simix/smx_context_private.h +++ b/include/bindings/smx_context.h @@ -6,8 +6,8 @@ /* 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. */ -#ifndef _XBT_CONTEXT_PRIVATE_H -#define _XBT_CONTEXT_PRIVATE_H +#ifndef _XBT_CONTEXT_H +#define _XBT_CONTEXT_H #include "xbt/swag.h" #include "simix/private.h" @@ -53,4 +53,4 @@ void *smx_ctx_base_get_data(smx_context_t context); SG_END_DECL() -#endif /* !_XBT_CONTEXT_PRIVATE_H */ +#endif /* !_XBT_CONTEXT_H */ diff --git a/src/bindings/ruby_bindings.h b/src/bindings/ruby_bindings.h index cfe8f5e614..b5be7a7a15 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 "simix/smx_context_private.h" +#include "bindings/smx_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.c b/src/simix/smx_context.c index e15fbfc299..f00c5b0998 100644 --- a/src/simix/smx_context.c +++ b/src/simix/smx_context.c @@ -10,7 +10,7 @@ #include "xbt/log.h" #include "xbt/swag.h" #include "private.h" -#include "simix/smx_context_private.h" +#include "bindings/smx_context.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix, "Context switching mecanism"); diff --git a/src/simix/smx_context_base.c b/src/simix/smx_context_base.c index 883e83bbaa..6e05383da7 100644 --- a/src/simix/smx_context_base.c +++ b/src/simix/smx_context_base.c @@ -8,7 +8,7 @@ #include "xbt/function_types.h" -#include "smx_context_private.h" +#include "bindings/smx_context.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(bindings); diff --git a/src/simix/smx_context_ruby.c b/src/simix/smx_context_ruby.c index ad7f1e0f38..4801a6b462 100644 --- a/src/simix/smx_context_ruby.c +++ b/src/simix/smx_context_ruby.c @@ -11,7 +11,7 @@ #include "xbt/log.h" #include "xbt/asserts.h" -#include "smx_context_private.h" +#include "bindings/smx_context.h" #include "bindings/ruby_bindings.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ruby); diff --git a/src/simix/smx_context_sysv_private.h b/src/simix/smx_context_sysv_private.h index 56f3fb55b7..2d2aea04ca 100644 --- a/src/simix/smx_context_sysv_private.h +++ b/src/simix/smx_context_sysv_private.h @@ -10,7 +10,7 @@ #define _XBT_CONTEXT_SYSV_PRIVATE_H #include "xbt/swag.h" -#include "simix/smx_context_private.h" +#include "bindings/smx_context.h" #include "portable.h" SG_BEGIN_DECL()