From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 15 Mar 2016 12:34:12 +0000 (+0100)
Subject: Revert my (subtle) attempts to fork simgrid...
X-Git-Tag: v3_13~424
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/e7c0a8d73d340b86d3236d7e0458898600d1c0fe

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

diff --git a/include/xbt/string.hpp b/include/xbt/string.hpp
index 633162a1f2..86a0c9825e 100644
--- 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. */
 
-#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
diff --git a/src/mc/mc_protocol.h b/src/mc/mc_protocol.h
index b48902b545..ac3c0dbaf3 100644
--- 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
  */
-#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"