From 1511765e414b3585548622c29bacf2b06eb5d98b Mon Sep 17 00:00:00 2001 From: degomme Date: Fri, 5 Feb 2016 15:58:59 +0100 Subject: [PATCH] (try to) Unify detection of windows. _WIN32 may not be defined for 64 bits systems --- src/simix/RawContext.cpp | 8 ++++---- src/simix/smx_context.cpp | 2 +- src/xbt/xbt_main.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/simix/RawContext.cpp b/src/simix/RawContext.cpp index c4f00e77a7..9cbb2df74d 100644 --- a/src/simix/RawContext.cpp +++ b/src/simix/RawContext.cpp @@ -128,7 +128,7 @@ __asm__ ( ".text\n" ".globl _raw_makecontext\n" "_raw_makecontext:\n" -#elif defined(_WIN32) +#elif defined(_XBT_WIN32) ".text\n" ".globl raw_makecontext\n" "raw_makecontext:\n" @@ -164,7 +164,7 @@ __asm__ ( ".text\n" ".globl _raw_swapcontext\n" "_raw_swapcontext:\n" -#elif defined(_WIN32) +#elif defined(_XBT_WIN32) ".text\n" ".globl raw_swapcontext\n" "raw_swapcontext:\n" @@ -204,7 +204,7 @@ __asm__ ( ); #elif PROCESSOR_i686 __asm__ ( -#if defined(APPLE) || defined(_WIN32) +#if defined(APPLE) || defined(_XBT_WIN32) ".text\n" ".globl _raw_makecontext\n" "_raw_makecontext:\n" @@ -231,7 +231,7 @@ __asm__ ( ); __asm__ ( -#if defined(APPLE) || defined(_WIN32) +#if defined(APPLE) || defined(_XBT_WIN32) ".text\n" ".globl _raw_swapcontext\n" "_raw_swapcontext:\n" diff --git a/src/simix/smx_context.cpp b/src/simix/smx_context.cpp index d63003525b..a07051b7b9 100644 --- a/src/simix/smx_context.cpp +++ b/src/simix/smx_context.cpp @@ -17,7 +17,7 @@ #include "simgrid/modelchecker.h" -#ifdef _WIN32 +#ifdef _XBT_WIN32 #include #include #else diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index 9c718dfdb8..7c6795f3b7 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -90,7 +90,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, static void xbt_preinit(void) { unsigned int seed = 2147483647; -#ifndef WIN32 +#ifndef _XBT_WIN32 xbt_pagesize = sysconf(_SC_PAGESIZE); #else SYSTEM_INFO si; @@ -115,7 +115,7 @@ static void xbt_preinit(void) { xbt_dict_preinit(); srand(seed); -#ifndef _WIN32 +#ifndef _XBT_WIN32 srand48(seed); #endif atexit(xbt_postexit); -- 2.20.1