Rename gras_config to internal_config.

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 82f8524..0389ec4 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -736,8 +736,8 @@ endif()
 configure_file("${CMAKE_HOME_DIRECTORY}/src/context_sysv_config.h.in"                  "${CMAKE_BINARY_DIR}/src/context_sysv_config.h" @ONLY IMMEDIATE)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/gras_config.h.in"         "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
-configure_file("${CMAKE_BINARY_DIR}/src/gras_config.h"                         "${CMAKE_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/src/internal_config.h.in"     "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_BINARY_DIR}/src/internal_config.h"                     "${CMAKE_BINARY_DIR}/src/internal_config.h" @ONLY IMMEDIATE)
 configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid_config.h.in"           "${CMAKE_BINARY_DIR}/include/simgrid_config.h" @ONLY IMMEDIATE)
 
 set(top_srcdir "${CMAKE_HOME_DIRECTORY}")
@@ -789,7 +789,7 @@ set(generated_headers_to_install
 
 set(generated_headers
   ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h
-  ${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h
+  ${CMAKE_CURRENT_BINARY_DIR}/src/internal_config.h
   )
 
 set(generated_files_to_clean

diff --git a/buildtools/Cmake/src/gras_config.h.in b/buildtools/Cmake/src/internal_config.h.in
similarity index 99%
rename from buildtools/Cmake/src/gras_config.h.in
rename to buildtools/Cmake/src/internal_config.h.in
index 082e1b8..31055f4 100644 (file)
--- a/buildtools/Cmake/src/gras_config.h.in
+++ b/buildtools/Cmake/src/internal_config.h.in
@@ -1,5 +1,5 @@
-// <root>/buildtools/Cmake/gras_config.h.in is user-written.
-// With Cmake it creates <root>/src/gras_config.h
+// <root>/buildtools/Cmake/internal_config.h.in is user-written.
+// With Cmake it creates <root>/src/internal_config.h
 
 /* Set somes variables for Windows compilation */
 

diff --git a/src/portable.h b/src/portable.h
index 70701e0..f18a878 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -10,7 +10,7 @@
 #ifndef GRAS_PORTABLE_H
 #define GRAS_PORTABLE_H
 
-#include "gras_config.h"
+#include "internal_config.h"
 #include "xbt/misc.h"
 /* 
  * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).

diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 0ce478f..8c1e185 100644 (file)
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -11,7 +11,7 @@
 #include "xbt/swag.h"
 #include "xbt/xbt_os_thread.h"
 #include "smx_private.h"
-#include "gras_config.h"
+#include "internal_config.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
                                 "Context switching mechanism");

diff --git a/src/simix/smx_context_sysv.c b/src/simix/smx_context_sysv.c
index 9764af2..9acbbd1 100644 (file)
--- a/src/simix/smx_context_sysv.c
+++ b/src/simix/smx_context_sysv.c
@@ -10,7 +10,7 @@
 
 #include "xbt/parmap.h"
 #include "smx_private.h"
-#include "gras_config.h"
+#include "internal_config.h"
 #include "context_sysv_config.h"        /* loads context system definitions */
 #include "mc/mc.h"
 

diff --git a/src/surf/random_mgr.c b/src/surf/random_mgr.c
index d87ce7b..07cac22 100644 (file)
--- a/src/surf/random_mgr.c
+++ b/src/surf/random_mgr.c
@@ -6,7 +6,7 @@
 
 #include "surf/random_mgr.h"
 #include "xbt/sysdep.h"
-#include "gras_config.h" /*_XBT_WIN32*/
+#include "internal_config.h" /*_XBT_WIN32*/
 #include <math.h>
 #include <stdlib.h>
 

diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h
index 5490781..cdc5fb4 100644 (file)
--- a/src/surf/surf_routing_private.h
+++ b/src/surf/surf_routing_private.h
@@ -8,7 +8,7 @@
 #define _SURF_SURF_ROUTING_PRIVATE_H
 
 #include <float.h>
-#include "gras_config.h"
+#include "internal_config.h"
 
 #include "surf_private.h"
 #include "xbt/dynar.h"

diff --git a/src/win32/config.h b/src/win32/config.h
index 686579b..37714fb 100644 (file)
--- a/src/win32/config.h
+++ b/src/win32/config.h
@@ -15,7 +15,7 @@
 */
 #if defined(__GNUC__)
         /* data comes from autoconf when using gnuc (cross-compiling?) */
-  # include "gras_config.h"
+  # include "internal_config.h"
   #ifndef _XBT_WIN32
     typedef unsigned int uint32_t;
   #endif

diff --git a/src/xbt/mmalloc/mm_legacy.c b/src/xbt/mmalloc/mm_legacy.c
index 96610ee..9ae3771 100644 (file)
--- a/src/xbt/mmalloc/mm_legacy.c
+++ b/src/xbt/mmalloc/mm_legacy.c
@@ -7,7 +7,7 @@
 /* Redefine the classical malloc/free/realloc functions so that they fit well in the mmalloc framework */
 
 #include "mmprivate.h"
-#include "gras_config.h"
+#include "internal_config.h"
 #include <math.h>
 
 

diff --git a/src/xbt/parmap.c b/src/xbt/parmap.c
index d163965..6e0a728 100644 (file)
--- a/src/xbt/parmap.c
+++ b/src/xbt/parmap.c
@@ -3,7 +3,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. */
-#include "gras_config.h"
+#include "internal_config.h"
 #include <unistd.h>
 
 #ifndef _XBT_WIN32
@@ -484,7 +484,7 @@ static void xbt_parmap_busy_worker_wait(xbt_parmap_t parmap, unsigned round)
 #include "xbt/ex.h"
 #include "xbt/xbt_os_thread.h"
 #include "xbt/xbt_os_time.h"
-#include "gras_config.h"        /* HAVE_FUTEX_H */
+#include "internal_config.h"        /* HAVE_FUTEX_H */
 
 XBT_TEST_SUITE("parmap", "Parallel Map");
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_parmap_unit);

diff --git a/src/xbt/setset.c b/src/xbt/setset.c
index 056fb82..33328fd 100644 (file)
--- a/src/xbt/setset.c
+++ b/src/xbt/setset.c
@@ -3,7 +3,7 @@
 #include <string.h>
 #include "setset_private.h"
 #include "xbt/sysdep.h"
-#include "gras_config.h" /*_XBT_WIN32*/
+#include "internal_config.h" /*_XBT_WIN32*/
 
 /*The function ffs doesn't exist for windows*/
 #ifdef _XBT_WIN32

diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c
index 46686bb..e3df76f 100644 (file)
--- a/src/xbt/xbt_main.c
+++ b/src/xbt/xbt_main.c
@@ -8,7 +8,7 @@
 
 #include "xbt/misc.h"
 #include "simgrid_config.h"     /*HAVE_MMAP _XBT_WIN32 */
-#include "gras_config.h"        /* MMALLOC_WANT_OVERRIDE_LEGACY */
+#include "internal_config.h"        /* MMALLOC_WANT_OVERRIDE_LEGACY */
 #include "time.h"               /* to seed the random generator */
 
 #include "xbt/sysdep.h"

diff --git a/src/xbt/xbt_os_thread.c b/src/xbt/xbt_os_thread.c
index 4b7d8fb..05924d2 100644 (file)
--- a/src/xbt/xbt_os_thread.c
+++ b/src/xbt/xbt_os_thread.c
@@ -8,7 +8,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. */
 
-#include "gras_config.h"
+#include "internal_config.h"
 #include "xbt/sysdep.h"
 #include "xbt/ex.h"
 #include "xbt/ex_interface.h"   /* We play crude games with exceptions */

diff --git a/src/xbt/xbt_replay.c b/src/xbt/xbt_replay.c
index 6b71973..116b0bc 100644 (file)
--- a/src/xbt/xbt_replay.c
+++ b/src/xbt/xbt_replay.c
@@ -5,7 +5,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 #include "simgrid_config.h" //For getline, keep that include first
 
-#include "gras_config.h"
+#include "internal_config.h"
 #include <errno.h>
 #include "xbt/sysdep.h"
 #include "xbt/log.h"

diff --git a/testsuite/xbt/parmap_bench.c b/testsuite/xbt/parmap_bench.c
index cec9426..d63bfc3 100644 (file)
--- a/testsuite/xbt/parmap_bench.c
+++ b/testsuite/xbt/parmap_bench.c
@@ -3,7 +3,7 @@
 #include <xbt/dynar.h>
 #include <xbt/parmap.h>
 #include <xbt/sysdep.h>
-#include <gras_config.h>        /* HAVE_FUTEX_H */
+#include <internal_config.h>        /* HAVE_FUTEX_H */
 #include "xbt/xbt_os_time.h"
 
 #define MODES_DEFAULT 0x7