-/* 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
}
/* 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
- #error "No architecture defined for Windows build.
+ #error "No architecture defined for Windows build."
#endif
/* Save/Restore the full machine context */