Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / simix / smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index b19e9665848d6c54f0d55d78d0bec5587d6200b5..178acd252d2782021ad93875e904592eca31e01e 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -23,7 +23,6 @@
 #include "smx_network_private.h"
 #include "smx_smurf_private.h"
 #include "smx_synchro_private.h"
-#include "simix/context.h"
 
 /* Define only for SimGrid benchmarking purposes */
 #undef TIME_BENCH
@@ -141,7 +140,7 @@ typedef struct s_smx_action {
       void *dst_buff;
       size_t src_buff_size;
       size_t *dst_buff_size;
-      char copied;
+      int copied:1;                   /* whether the data were already copied */
 
       void* src_data;                     /* User data associated to communication */
       void* dst_data;
@@ -282,7 +281,7 @@ static XBT_INLINE void SIMIX_context_runall(void)
  */
 static XBT_INLINE smx_context_t SIMIX_context_self(void)
 {
-  if (simix_global && simix_global->context_factory != NULL) {
+  if (simix_global && simix_global->context_factory) {
     return simix_global->context_factory->self();
   }