A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename a struct to obey the C++ One Definition Rule (and please gcc6)
[simgrid.git]
/
src
/
simix
/
RawContext.cpp
diff --git
a/src/simix/RawContext.cpp
b/src/simix/RawContext.cpp
index
c4f00e7
..
9cbb2df
100644
(file)
--- a/
src/simix/RawContext.cpp
+++ b/
src/simix/RawContext.cpp
@@
-128,7
+128,7
@@
__asm__ (
".text\n"
".globl _raw_makecontext\n"
"_raw_makecontext:\n"
".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"
".text\n"
".globl raw_makecontext\n"
"raw_makecontext:\n"
@@
-164,7
+164,7
@@
__asm__ (
".text\n"
".globl _raw_swapcontext\n"
"_raw_swapcontext:\n"
".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"
".text\n"
".globl raw_swapcontext\n"
"raw_swapcontext:\n"
@@
-204,7
+204,7
@@
__asm__ (
);
#elif PROCESSOR_i686
__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"
".text\n"
".globl _raw_makecontext\n"
"_raw_makecontext:\n"
@@
-231,7
+231,7
@@
__asm__ (
);
__asm__ (
);
__asm__ (
-#if defined(APPLE) || defined(_WIN32)
+#if defined(APPLE) || defined(_
XBT_
WIN32)
".text\n"
".globl _raw_swapcontext\n"
"_raw_swapcontext:\n"
".text\n"
".globl _raw_swapcontext\n"
"_raw_swapcontext:\n"