From da3273265fa105cc186a80c249afcc33f372c313 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Wed, 18 May 2011 14:27:06 +0200 Subject: [PATCH] [mc] Don't define variable "raw_heap_fd" twice. Declare it "extern" in include file. Found by compiling with "-fno-common". Actually comment the declaration/definition, since it is not used. --- src/mc/mc_memory.c | 1 + src/mc/private.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mc/mc_memory.c b/src/mc/mc_memory.c index d6a5063b7e..c2fe2a132e 100644 --- a/src/mc/mc_memory.c +++ b/src/mc/mc_memory.c @@ -13,6 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_memory, mc, /* Pointers to each of the heap regions to use */ void *std_heap = NULL; /* memory erased each time the MC stuff rollbacks to the beginning. Almost everything goes here */ void *raw_heap = NULL; /* memory persistent over the MC rollbacks. Only MC stuff should go there */ +/* int raw_heap_fd; */ /* unsued */ /* Initialize the model-checker memory subsystem */ /* It creates the two heap regions: std_heap and raw_heap */ diff --git a/src/mc/private.h b/src/mc/private.h index 7b4acca159..1adc99aa82 100644 --- a/src/mc/private.h +++ b/src/mc/private.h @@ -122,7 +122,7 @@ void MC_print_statistics(mc_stats_t); extern void *std_heap; extern void *raw_heap; -int raw_heap_fd; +/* extern int raw_heap_fd; */ /* unused */ #define STD_HEAP_SIZE 20480000 /* Maximum size of the system's heap */ /* FIXME: Horrible hack! because the mmalloc library doesn't provide yet of */ -- 2.20.1