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 remote-tracking branch 'origin/mc'
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
30c1a84
..
3af5c03
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-85,9
+85,13
@@
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
static void xbt_preinit(void) {
unsigned int seed = 2147483647;
static void xbt_preinit(void) {
unsigned int seed = 2147483647;
-
+#ifndef WIN32
xbt_pagesize = sysconf(_SC_PAGESIZE);
xbt_pagesize = sysconf(_SC_PAGESIZE);
-
+#else
+ SYSTEM_INFO si;
+ GetSystemInfo(&si);
+ xbt_pagesize = si.dwPageSize;
+#endif
#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
#endif
#ifdef MMALLOC_WANT_OVERRIDE_LEGACY
mmalloc_preinit();
#endif