From a8b5e623ecad573ef13267bd304777462993efdb Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Fri, 23 Nov 2012 10:20:12 +0100 Subject: [PATCH] Rename gras_config to internal_config. --- buildtools/Cmake/CompleteInFiles.cmake | 6 +++--- .../Cmake/src/{gras_config.h.in => internal_config.h.in} | 4 ++-- src/portable.h | 2 +- src/simix/smx_context.c | 2 +- src/simix/smx_context_sysv.c | 2 +- src/surf/random_mgr.c | 2 +- src/surf/surf_routing_private.h | 2 +- src/win32/config.h | 2 +- src/xbt/mmalloc/mm_legacy.c | 2 +- src/xbt/parmap.c | 4 ++-- src/xbt/setset.c | 2 +- src/xbt/xbt_main.c | 2 +- src/xbt/xbt_os_thread.c | 2 +- src/xbt/xbt_replay.c | 2 +- testsuite/xbt/parmap_bench.c | 2 +- 15 files changed, 19 insertions(+), 19 deletions(-) rename buildtools/Cmake/src/{gras_config.h.in => internal_config.h.in} (99%) diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 82f8524694..0389ec404d 100644 --- 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 082e1b82d5..31055f46cf 100644 --- a/buildtools/Cmake/src/gras_config.h.in +++ b/buildtools/Cmake/src/internal_config.h.in @@ -1,5 +1,5 @@ -// /buildtools/Cmake/gras_config.h.in is user-written. -// With Cmake it creates /src/gras_config.h +// /buildtools/Cmake/internal_config.h.in is user-written. +// With Cmake it creates /src/internal_config.h /* Set somes variables for Windows compilation */ diff --git a/src/portable.h b/src/portable.h index 70701e009e..f18a87865f 100644 --- 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 0ce478fe81..8c1e1856e0 100644 --- 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 9764af2660..9acbbd1df6 100644 --- 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 d87ce7b527..07cac22360 100644 --- 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 #include diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h index 5490781e95..cdc5fb4e34 100644 --- 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 -#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 686579ba9f..37714fbbf2 100644 --- 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 96610ee1ca..9ae3771bef 100644 --- 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 diff --git a/src/xbt/parmap.c b/src/xbt/parmap.c index d163965fe5..6e0a7286ac 100644 --- 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 #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 056fb82e7a..33328fd3af 100644 --- a/src/xbt/setset.c +++ b/src/xbt/setset.c @@ -3,7 +3,7 @@ #include #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 46686bbe00..e3df76fd1e 100644 --- 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 4b7d8fbcc5..05924d2217 100644 --- 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 6b719735ab..116b0bcee7 100644 --- 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 #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/testsuite/xbt/parmap_bench.c b/testsuite/xbt/parmap_bench.c index cec94262e2..d63bfc3fe4 100644 --- a/testsuite/xbt/parmap_bench.c +++ b/testsuite/xbt/parmap_bench.c @@ -3,7 +3,7 @@ #include #include #include -#include /* HAVE_FUTEX_H */ +#include /* HAVE_FUTEX_H */ #include "xbt/xbt_os_time.h" #define MODES_DEFAULT 0x7 -- 2.20.1