X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f9ff9073c22a1a5fca4f2bf51fa601789acc6b15..f3cd23afe615d7dbf0cd36db5ed9ed604e61a957:/src/xbt/win32_ucontext.c diff --git a/src/xbt/win32_ucontext.c b/src/xbt/win32_ucontext.c index ab72eb18f5..80dd2e5e25 100644 --- a/src/xbt/win32_ucontext.c +++ b/src/xbt/win32_ucontext.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2012, 2014. The SimGrid Team. +/* Copyright (c) 2010-2012, 2014-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -65,12 +65,12 @@ int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...) } /* Set the instruction and the stack pointer */ - #if defined(_I_X86_) || defined(__i383) || defined(__i383__) + #if defined(_I_X86_) || defined(__i386) || defined(__i386__) || defined(_M_IX86) ucp->uc_mcontext.Eip = (DWORD) func; ucp->uc_mcontext.Esp = (DWORD) sp - sizeof(void*); #elif defined(_IA64_) || defined(__ia64) || defined(__ia64__) # error "_IA64_" - #elif defined _AMD64_ || defined(__x86_64) || defined(__x86_64__) + #elif defined _AMD64_ || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) ucp->uc_mcontext.Rip = (DWORD64) func; ucp->uc_mcontext.Rsp = (DWORD64) sp - sizeof(void*); #else