X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/564a883b3d816d2c5d227f5311d248ef799b5190..0b8e893d1b242673966bee6dbf894541288478d9:/src/surf/surf_interface.cpp

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index e1424f4741..2f785d08d7 100644
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -114,7 +114,7 @@ double surf_get_clock(void)
   return NOW;
 }
 
-#ifdef _XBT_WIN32
+#ifdef _WIN32
 # define FILE_DELIM "\\"
 #else
 # define FILE_DELIM "/"         /* FIXME: move to better location */
@@ -144,7 +144,7 @@ FILE *surf_fopen(const char *name, const char *mode)
   return NULL;
 }
 
-#ifdef _XBT_WIN32
+#ifdef _WIN32
 #include <windows.h>
 #define MAX_DRIVE 26
 static const char *disk_drives_letter_table[MAX_DRIVE] = {
@@ -163,7 +163,7 @@ 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);
@@ -191,7 +191,7 @@ const char *__surf_get_initial_path(void)
  */
 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);
 
@@ -235,7 +235,7 @@ int find_model_description(s_surf_model_description_t * table,
   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);
 }