Fix compilation and configuration since win commits

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index 8ca62bb..8d9e915 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -13,7 +13,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix,
                                 "Logging specific to SIMIX (network)");
 
 static xbt_dict_t rdv_points = NULL;
-XBT_PUBLIC(unsigned long int) smx_total_comms = 0;
+XBT_IMPORT_NO_EXPORT(unsigned long int) smx_total_comms = 0;
 
 static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall);
 static void SIMIX_comm_copy_data(smx_action_t comm);

diff --git a/src/smpi/smpicc.in b/src/smpi/smpicc.in
index c5627b3..a508a38 100755 (executable)
--- a/src/smpi/smpicc.in
+++ b/src/smpi/smpicc.in
@@ -5,12 +5,12 @@ CC=@CMAKE_C_COMPILER@
 INCLUDEARGS="-I@includedir@ -I@includedir@/smpi -I@CMAKE_BINARY_DIR@/include"
 CMAKE_LINKARGS="-L@CMAKE_LINKARGS@"
 
-if [ @WIN32@ != 1 ]; then
-LINKARGS="-lsimgrid -lsmpi -lm"
-CFLAGS="-O2 -Dmain=smpi_simulated_main"
+if [ "@WIN32@" != "1" ]; then
+  LINKARGS="-lsimgrid -lsmpi -lm"
+  CFLAGS="-O2 -Dmain=smpi_simulated_main"
 else
-CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
-LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi.dll"
+  CFLAGS="-O2 -include @includedir@/smpi/smpi_main.h"
+  LINKARGS="@CMAKE_BINARY_DIR@\lib\libsimgrid.dll @CMAKE_BINARY_DIR@\lib\libsmpi.dll"
 fi
 
 CMDLINE=""

diff --git a/src/surf/surfxml_parseplatf.c b/src/surf/surfxml_parseplatf.c
index 0a404f2..b3fdf29 100644 (file)
--- a/src/surf/surfxml_parseplatf.c
+++ b/src/surf/surfxml_parseplatf.c
@@ -25,8 +25,8 @@ int surfxml_bufferstack_size = 2048;
 
 static char *old_buff = NULL;
 
-XBT_PUBLIC(unsigned int) surfxml_buffer_stack_stack_ptr;
-XBT_PUBLIC(unsigned int) surfxml_buffer_stack_stack[1024];
+XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack_ptr;
+XBT_IMPORT_NO_EXPORT(unsigned int) surfxml_buffer_stack_stack[1024];
 
 
 void surfxml_bufferstack_push(int new)

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index f51a177..4f45fb5 100644 (file)
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -2,10 +2,11 @@ cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 if(NOT WIN32)
-add_executable(log_large_test log_large_test.c)
-add_executable(parallel_log_crashtest parallel_log_crashtest.c)
-if(HAVE_MMAP)
-  add_executable(mmalloc_test mmalloc_test.c)
+  add_executable(log_large_test log_large_test.c)
+  add_executable(parallel_log_crashtest parallel_log_crashtest.c)
+  if(HAVE_MMAP)
+    add_executable(mmalloc_test mmalloc_test.c)
+  endif()
 endif()
 
 ### Add definitions for compile