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
The memory management of dirname is stupid, so be brutal
[simgrid.git]
/
src
/
xbt
/
xbt_main.c
diff --git
a/src/xbt/xbt_main.c
b/src/xbt/xbt_main.c
index
e1a234f
..
7c6795f
100644
(file)
--- a/
src/xbt/xbt_main.c
+++ b/
src/xbt/xbt_main.c
@@
-10,8
+10,8
@@
#include "xbt/misc.h"
#include "simgrid_config.h" /* _XBT_WIN32 */
#include "xbt/misc.h"
#include "simgrid_config.h" /* _XBT_WIN32 */
-#include "
internal_config.h"
/* MMALLOC_WANT_OVERRIDE_LEGACY */
-#include "portable.h"
+#include "
src/internal_config.h"
/* MMALLOC_WANT_OVERRIDE_LEGACY */
+#include "
src/
portable.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/dynar.h"
@@
-19,7
+19,7
@@
#include "xbt/module.h" /* this module */
#include "xbt/module.h" /* this module */
-#include "xbt_modinter.h" /* prototype of other module's init/exit in XBT */
+#include "
src/
xbt_modinter.h" /* prototype of other module's init/exit in XBT */
#include "simgrid/sg_config.h"
#include "simgrid/sg_config.h"
@@
-90,7
+90,7
@@
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
+#ifndef
_XBT_
WIN32
xbt_pagesize = sysconf(_SC_PAGESIZE);
#else
SYSTEM_INFO si;
xbt_pagesize = sysconf(_SC_PAGESIZE);
#else
SYSTEM_INFO si;
@@
-115,7
+115,7
@@
static void xbt_preinit(void) {
xbt_dict_preinit();
srand(seed);
xbt_dict_preinit();
srand(seed);
-#ifndef _WIN32
+#ifndef _
XBT_
WIN32
srand48(seed);
#endif
atexit(xbt_postexit);
srand48(seed);
#endif
atexit(xbt_postexit);