git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4787
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
/* the exception context */
typedef ex_ctx_t *(*ex_ctx_cb_t)(void);
/* the exception context */
typedef ex_ctx_t *(*ex_ctx_cb_t)(void);
-extern XBT_PUBLIC_DATA(ex_ctx_cb_t) __xbt_ex_ctx;
+XBT_PUBLIC_DATA(ex_ctx_cb_t) __xbt_ex_ctx;
extern ex_ctx_t *__xbt_ex_ctx_default(void);
/* the termination handler */
typedef void (*ex_term_cb_t)(xbt_ex_t *);
extern ex_ctx_t *__xbt_ex_ctx_default(void);
/* the termination handler */
typedef void (*ex_term_cb_t)(xbt_ex_t *);
-extern XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate;
+XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate;
extern void __xbt_ex_terminate_default(xbt_ex_t *e);
/** @brief Introduce a block where exception may be dealed with
extern void __xbt_ex_terminate_default(xbt_ex_t *e);
/** @brief Introduce a block where exception may be dealed with
e_xbt_log_priority_t priority);
e_xbt_log_priority_t priority);
-extern XBT_PUBLIC_DATA(s_xbt_log_category_t) _XBT_LOGV(XBT_LOG_ROOT_CAT);
+XBT_PUBLIC_DATA(s_xbt_log_category_t) _XBT_LOGV(XBT_LOG_ROOT_CAT);
XBT_LOG_EXTERNAL_CATEGORY(GRAS);
XBT_LOG_EXTERNAL_CATEGORY(GRAS);
/* globals */
static gras_procdata_t *_gras_procdata = NULL;
/* globals */
static gras_procdata_t *_gras_procdata = NULL;
-XBT_PUBLIC_DATA(char const *) _gras_procname = NULL;
+XBT_EXPORT_NO_IMPORT(char const *) _gras_procname = NULL;
void gras_process_init() {
_gras_procdata=xbt_new0(gras_procdata_t,1);
void gras_process_init() {
_gras_procdata=xbt_new0(gras_procdata_t,1);
*/
XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
*/
XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
-extern XBT_PUBLIC_DATA(int) surf_cpu_model_description_size;
+XBT_PUBLIC_DATA(int) surf_cpu_model_description_size;
/** \brief The list of all available cpu model models
* \ingroup SURF_models
*/
/** \brief The list of all available cpu model models
* \ingroup SURF_models
*/
-extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[];
-extern XBT_PUBLIC_DATA(int) surf_network_model_description_size;
+XBT_PUBLIC_DATA(int) surf_network_model_description_size;
/** \brief The list of all available network model models
* \ingroup SURF_models
*/
/** \brief The list of all available network model models
* \ingroup SURF_models
*/
-extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
/** \brief Workstation model extension public
* \ingroup SURF_models
/** \brief Workstation model extension public
* \ingroup SURF_models
*/
XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename);
*/
XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename);
-extern XBT_PUBLIC_DATA(int) surf_workstation_model_description_size;
+XBT_PUBLIC_DATA(int) surf_workstation_model_description_size;
/** \brief The list of all available workstation model models
* \ingroup SURF_models
*/
/** \brief The list of all available workstation model models
* \ingroup SURF_models
*/
-extern XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[];
/** \brief The network links
* \ingroup SURF_models
/** \brief The network links
* \ingroup SURF_models
}
/* the externally visible API */
}
/* the externally visible API */
-XBT_PUBLIC_DATA(ex_ctx_cb_t) __xbt_ex_ctx = &__xbt_ex_ctx_default;
-XBT_PUBLIC_DATA(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
+XBT_EXPORT_NO_IMPORT(ex_ctx_cb_t) __xbt_ex_ctx = &__xbt_ex_ctx_default;
+XBT_EXPORT_NO_IMPORT(ex_term_cb_t) __xbt_ex_terminate = &__xbt_ex_terminate_default;
void xbt_ex_free(xbt_ex_t e) {
void xbt_ex_free(xbt_ex_t e) {
-#ifndef _MSC_VER
-XBT_PUBLIC_DATA(s_xbt_log_category_t)
-#else
-s_xbt_log_category_t
-#endif
-_XBT_LOGV(XBT_LOG_ROOT_CAT) = {
+s_xbt_log_category_t _XBT_LOGV(XBT_LOG_ROOT_CAT) = {
0, 0, 0,
"root", xbt_log_priority_uninitialized, 0,
NULL, 0
0, 0, 0,
"root", xbt_log_priority_uninitialized, 0,
NULL, 0