From: unknown <pierre@.(none)>
Date: Fri, 13 Jan 2012 10:35:29 +0000 (+0100)
Subject: Add more debug messages and add flag _I_X86 on windows platform
X-Git-Tag: exp_20120216~136
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/64eaea8aebb5045fa34adcd14e9ae7cb94e98200

Add more debug messages and add flag _I_X86 on windows platform
---

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 7c1511cc10..c085b1bdf6 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -334,14 +334,18 @@ IF(CMAKE_CROSSCOMPILING)
 		set(IS_WINDOWS 1)	
 	ENDIF(WIN32)
 ELSE(CMAKE_CROSSCOMPILING)
+    file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
+    file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
     exec_program(
                  "${CMAKE_C_COMPILER} ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/test_prog/prog_AC_CHECK_MCSC.c ${mcsc_flags} -o testprog"
                  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/
                  OUTPUT_VARIABLE COMPILE_mcsc_VAR)
 
-    file(REMOVE ${CMAKE_BINARY_DIR}/conftestval)
     if(NOT COMPILE_mcsc_VAR)
+        message(STATUS "prog_AC_CHECK_MCSC.c is compilable")
         exec_program("${CMAKE_BINARY_DIR}/testprog" OUTPUT_VARIABLE var_compil)
+    else(NOT COMPILE_mcsc_VAR)
+        message(STATUS "prog_AC_CHECK_MCSC.c is not compilable")
     endif(NOT COMPILE_mcsc_VAR)
     file(REMOVE "${CMAKE_BINARY_DIR}/testprog*")
     
@@ -560,7 +564,7 @@ if(HAVE_MAKECONTEXT OR WIN32)
 	
     if(WIN32)
         if(ARCH_32_BITS)
-	    set(makecontext_CPPFLAGS "-DTEST_makecontext")
+	    set(makecontext_CPPFLAGS "-DTEST_makecontext -D_I_X86_")
 	    else(ARCH_32_BITS)
 	    set(makecontext_CPPFLAGS "-DTEST_makecontext -D_AMD64_")
 	    endif(ARCH_32_BITS)
diff --git a/src/xbt/win32_ucontext.c b/src/xbt/win32_ucontext.c
index c91c39e426..1d8adceb82 100644
--- a/src/xbt/win32_ucontext.c
+++ b/src/xbt/win32_ucontext.c
@@ -59,7 +59,7 @@ int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...)
   }
   
       /* Set the instruction and the stack pointer */
-  #ifdef I_X86_
+  #ifdef _I_X86_
   ucp->uc_mcontext.Eip = (DWORD) func;
   ucp->uc_mcontext.Esp = (DWORD) sp - sizeof(void*);
   #endif