return NOW;
}
-#ifdef _XBT_WIN32
+#ifdef _WIN32
# define FILE_DELIM "\\"
#else
# define FILE_DELIM "/" /* FIXME: move to better location */
return NULL;
}
-#ifdef _XBT_WIN32
+#ifdef _WIN32
#include <windows.h>
#define MAX_DRIVE 26
static const char *disk_drives_letter_table[MAX_DRIVE] = {
const char *__surf_get_initial_path(void)
{
-#ifdef _XBT_WIN32
+#ifdef _WIN32
unsigned i;
char current_directory[MAX_PATH + 1] = { 0 };
unsigned int len = GetCurrentDirectory(MAX_PATH + 1, current_directory);
*/
int __surf_is_absolute_file_path(const char *file_path)
{
-#ifdef _XBT_WIN32
+#ifdef _WIN32
WIN32_FIND_DATA wfd = { 0 };
HANDLE hFile = FindFirstFile(file_path, &wfd);
return -1;
}
-static XBT_INLINE void surf_storage_free(void *r)
+static inline void surf_storage_free(void *r)
{
delete static_cast<simgrid::surf::Storage*>(r);
}
void surf_init(int *argc, char **argv)
{
+ if (host_list != nullptr) // Already initialized
+ return;
+
XBT_DEBUG("Create all Libs");
host_list = xbt_dict_new_homogeneous([](void*p) {
simgrid::s4u::Host* host = static_cast<simgrid::s4u::Host*>(p);