avoid any name clashes with msg/private.h so that the java interface can do crude...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3657 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/simix/private.h b/src/simix/private.h
index 2a15d93..48dfde9 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -56,7 +56,7 @@ typedef struct s_smx_simdata_process {
   char **argv;                  /* arguments table if any */
 } s_smx_simdata_process_t;
 
-typedef struct process_arg {
+typedef struct s_smx_process_arg {
   const char *name;
   smx_process_code_t code;
   void *data;
@@ -64,7 +64,7 @@ typedef struct process_arg {
   int argc;
   char **argv;
   double kill_time;
-} s_process_arg_t, *process_arg_t;
+} s_smx_process_arg_t, *smx_process_arg_t;
 
 /********************************* Mutex and Conditional ****************************/
 
@@ -102,7 +102,7 @@ extern int _simix_init_status; /* 0: beginning of time;
 extern xbt_cfg_t _simix_cfg_set;
 
 
-#define CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
+#define SIMIX_CHECK_HOST()  xbt_assert0(surf_workstation_resource->extension_public-> \
                                  get_state(SIMIX_host_self()->simdata->host)==SURF_CPU_ON,\
                                   "Host failed, you cannot call this function.")
 

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 8844f45..9fa7617 100644 (file)
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -45,10 +45,10 @@ static void parse_argument(void)
 
 static void parse_process_finalize(void)
 {
-  process_arg_t arg = NULL;
+  smx_process_arg_t arg = NULL;
   void * process = NULL;
   if(start_time>SIMIX_get_clock()) {
-    arg = xbt_new0(s_process_arg_t,1);
+    arg = xbt_new0(s_smx_process_arg_t,1);
     arg->name = parse_argv[0];
     arg->code = parse_code;
     arg->data = NULL;

diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index 754cb31..b84d48d 100644 (file)
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -274,7 +274,7 @@ double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
                while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
                        DEBUG2("got %p %p", fun, arg);
                        if(fun==SIMIX_process_create) {
-                               process_arg_t args = arg;
+                               smx_process_arg_t args = arg;
                                DEBUG2("Launching %s on %s", args->name, args->hostname);
                                process = SIMIX_process_create(args->name, args->code, 
                                                args->data, args->hostname,

diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index 46abe32..292177f 100644 (file)
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -263,7 +263,7 @@ void SIMIX_process_resume(smx_process_t process)
   smx_simdata_process_t simdata = NULL;
 
   xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-  CHECK_HOST();
+  SIMIX_CHECK_HOST();
 
   if(process == SIMIX_process_self()) {
                return;