Revert my (subtle) attempts to fork simgrid...

diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp
index 633162a..86a0c98 100644 (file)
--- a/include/xbt/string.hpp
+++ b/include/xbt/string.hpp
@@ -4,8 +4,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. */
 
 /* 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 SIMGRIC_XBT_STRING_HPP
-#define SIMGRIC_XBT_STRING_HPP
+#ifndef SIMGRID_XBT_STRING_HPP
+#define SIMGRID_XBT_STRING_HPP

 
 #include "src/internal_config.h"
 #if HAVE_MC
 
 #include "src/internal_config.h"
 #if HAVE_MC

diff --git a/src/mc/mc_protocol.h b/src/mc/mc_protocol.h
index b48902b..ac3c0db 100644 (file)
--- a/src/mc/mc_protocol.h
+++ b/src/mc/mc_protocol.h
@@ -20,7 +20,7 @@ SG_BEGIN_DECL()
 /** Environment variable name set by `simgrid-mc` to enable MC support in the
  *  children MC processes
  */
 /** Environment variable name set by `simgrid-mc` to enable MC support in the
  *  children MC processes
  */

-#define MC_ENV_VARIABLE "SIMGRIC_MC"
+#define MC_ENV_VARIABLE "SIMGRID_MC"

 
 /** Environment variable name used to pass the communication socket */
 #define MC_ENV_SOCKET_FD "SIMGRID_MC_SOCKET_FD"
 
 /** Environment variable name used to pass the communication socket */
 #define MC_ENV_SOCKET_FD "SIMGRID_MC_SOCKET_FD"