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
[java] Remove org.simgrid.msg.Process to xbt_main_func_t cast hack
[simgrid.git]
/
src
/
portable.h
diff --git
a/src/portable.h
b/src/portable.h
index
5aca544
..
7ccd0a7
100644
(file)
--- a/
src/portable.h
+++ b/
src/portable.h
@@
-10,7
+10,8
@@
#ifndef SIMGRID_PORTABLE_H
#define SIMGRID_PORTABLE_H
#ifndef SIMGRID_PORTABLE_H
#define SIMGRID_PORTABLE_H
-#include "internal_config.h"
+#include "src/internal_config.h"
+#include "xbt/base.h"
#include "xbt/misc.h"
#ifdef _XBT_WIN32
# include <windows.h>
#include "xbt/misc.h"
#ifdef _XBT_WIN32
# include <windows.h>
@@
-76,16
+77,10
@@
**** Time handling
****/
**** Time handling
****/
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
+#if HAVE_SYS_TIME_H
# include <sys/time.h>
# include <sys/time.h>
-# else
-# include <time.h>
-# endif
#endif
#endif
+#include <time.h>
/****
**** Signals
/****
**** Signals
@@
-109,9
+104,9
@@
XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list);
/* use internal functions when OS provided ones are borken */
#if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF)
/* use internal functions when OS provided ones are borken */
#if defined(HAVE_SNPRINTF) && defined(PREFER_PORTABLE_SNPRINTF)
-
extern
int portable_snprintf(char *str, size_t str_m, const char *fmt,
+
XBT_PRIVATE
int portable_snprintf(char *str, size_t str_m, const char *fmt,
/*args */ ...);
/*args */ ...);
-
extern
int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
+
XBT_PRIVATE
int portable_vsnprintf(char *str, size_t str_m, const char *fmt,
va_list ap);
#define snprintf portable_snprintf
#define vsnprintf portable_vsnprintf
va_list ap);
#define snprintf portable_snprintf
#define vsnprintf portable_vsnprintf