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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
RawContext.cpp
diff --git
a/src/simix/RawContext.cpp
b/src/simix/RawContext.cpp
index
bb1af0a
..
d131015
100644
(file)
--- a/
src/simix/RawContext.cpp
+++ b/
src/simix/RawContext.cpp
@@
-72,8
+72,7
@@
private:
ContextFactory* raw_factory()
{
ContextFactory* raw_factory()
{
- XBT_VERB("Using raw contexts. "
- "Because the glibc is just not good enough for us.");
+ XBT_VERB("Using raw contexts. Because the glibc is just not good enough for us.");
return new RawContextFactory();
}
return new RawContextFactory();
}
@@
-124,11
+123,11
@@
extern "C" void raw_swapcontext(raw_stack_t* old, raw_stack_t new_context);
#if PROCESSOR_x86_64
__asm__ (
#if PROCESSOR_x86_64
__asm__ (
-#if defined(
APPLE
)
+#if defined(
__APPLE__
)
".text\n"
".globl _raw_makecontext\n"
"_raw_makecontext:\n"
".text\n"
".globl _raw_makecontext\n"
"_raw_makecontext:\n"
-#elif defined(_
XBT_
WIN32)
+#elif defined(_WIN32)
".text\n"
".globl raw_makecontext\n"
"raw_makecontext:\n"
".text\n"
".globl raw_makecontext\n"
"raw_makecontext:\n"
@@
-160,11
+159,11
@@
__asm__ (
);
__asm__ (
);
__asm__ (
-#if defined(
APPLE
)
+#if defined(
__APPLE__
)
".text\n"
".globl _raw_swapcontext\n"
"_raw_swapcontext:\n"
".text\n"
".globl _raw_swapcontext\n"
"_raw_swapcontext:\n"
-#elif defined(_
XBT_
WIN32)
+#elif defined(_WIN32)
".text\n"
".globl raw_swapcontext\n"
"raw_swapcontext:\n"
".text\n"
".globl raw_swapcontext\n"
"raw_swapcontext:\n"
@@
-204,7
+203,7
@@
__asm__ (
);
#elif PROCESSOR_i686
__asm__ (
);
#elif PROCESSOR_i686
__asm__ (
-#if defined(
APPLE) || defined(_XBT
_WIN32)
+#if defined(
__APPLE__) || defined(
_WIN32)
".text\n"
".globl _raw_makecontext\n"
"_raw_makecontext:\n"
".text\n"
".globl _raw_makecontext\n"
"_raw_makecontext:\n"
@@
-231,7
+230,7
@@
__asm__ (
);
__asm__ (
);
__asm__ (
-#if defined(
APPLE) || defined(_XBT
_WIN32)
+#if defined(
__APPLE__) || defined(
_WIN32)
".text\n"
".globl _raw_swapcontext\n"
"_raw_swapcontext:\n"
".text\n"
".globl _raw_swapcontext\n"
"_raw_swapcontext:\n"