Merge branch 'master' into S4U

[simgrid.git] / src / mc / mc_base.h

diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index 00a453a..a72fbce 100644 (file)
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -1,23 +1,23 @@
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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 MC_BASE_H
-#define MC_BASE_H
+#ifndef SIMGRID_MC_BASE_H
+#define SIMGRID_MC_BASE_H
 
+#include <xbt/misc.h>
 #include <simgrid/simix.h>
 #include "simgrid_config.h"
 #include "internal_config.h"
 #include "../simix/smx_private.h"
 
-SG_BEGIN_DECL()
+// Marker for symbols which should be defined as XBT_PRIVATE but are used in
+// unit tests:
+#define MC_SHOULD_BE_INTERNAL
 
-/** Environment variable name set by `simgrid-mc` to enable MC support in the
- *  children MC processes
- */
-#define MC_ENV_VARIABLE "SIMGRIC_MC"
+SG_BEGIN_DECL()
 
 /** Check if the given simcall can be resolved
  *
@@ -39,7 +39,7 @@ int MC_request_is_visible(smx_simcall_t req);
  */
 void MC_wait_for_requests(void);
 
-extern double *mc_time;
+XBT_INTERNAL extern double *mc_time;
 
 SG_END_DECL()