mv src/mc/private.h src/mc/mc_private.h

diff --git a/src/mc/mc_checkpoint.c b/src/mc/mc_checkpoint.c
index da376da..dcf1a36 100644 (file)
--- a/src/mc/mc_checkpoint.c
+++ b/src/mc/mc_checkpoint.c
@@ -1,5 +1,5 @@
 #include <libgen.h>
 #include <libgen.h>

-#include "private.h"
+#include "mc_private.h"

 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index bae5fb1..2c9ad7f 100644 (file)
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -4,7 +4,7 @@
 /* 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. */
 

-#include "private.h"
+#include "mc_private.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
                                 "Logging specific to MC DPOR exploration");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
                                 "Logging specific to MC DPOR exploration");

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 7760797..a0ad3ee 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -6,7 +6,7 @@
 #include "../surf/surf_private.h"
 #include "../simix/smx_private.h"
 #include "xbt/fifo.h"
 #include "../surf/surf_private.h"
 #include "../simix/smx_private.h"
 #include "xbt/fifo.h"

-#include "private.h"
+#include "mc_private.h"

 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
 
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 75615b7..2cd817a 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -1,4 +1,4 @@
-#include "private.h"
+#include "mc_private.h"

 #include "unistd.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,
 #include "unistd.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_liveness, mc,

diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c
index c2fe2a1..593bdf4 100644 (file)
--- a/src/mc/mc_memory.c
+++ b/src/mc/mc_memory.c
@@ -1,7 +1,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "mc/mc.h"
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "mc/mc.h"

-#include "private.h"
+#include "mc_private.h"

 #include "xbt/log.h"
 #define _GNU_SOURCE
 
 #include "xbt/log.h"
 #define _GNU_SOURCE
 

diff --git a/src/mc/private.h b/src/mc/mc_private.h
similarity index 98%
rename from src/mc/private.h
rename to src/mc/mc_private.h
index d277c41..6309724 100644 (file)
--- a/src/mc/private.h
+++ b/src/mc/mc_private.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007-2011 Da 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. */
 
 /* 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. */

diff --git a/src/mc/mc_request.c b/src/mc/mc_request.c
index f6a70ad..cb23741 100644 (file)
--- a/src/mc/mc_request.c
+++ b/src/mc/mc_request.c
@@ -1,4 +1,4 @@
-#include "private.h"
+#include "mc_private.h"

 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
                                 "Logging specific to MC (request)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_request, mc,
                                 "Logging specific to MC (request)");

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index ad66b61..6c3b927 100644 (file)
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -2,7 +2,7 @@
 
 #include "../simix/smx_private.h"
 #include "xbt/fifo.h"
 
 #include "../simix/smx_private.h"
 #include "xbt/fifo.h"

-#include "private.h"
+#include "mc_private.h"

 
 /**
  * \brief Creates a state data structure used by the exploration algorithm
 
 /**
  * \brief Creates a state data structure used by the exploration algorithm