Reintroduce the changes to the windows build chain to allow gcc cross compilation...

[simgrid.git] / src / portable.h

diff --git a/src/portable.h b/src/portable.h
index 235105b..ab84d51 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -14,9 +14,9 @@
 /* 
  * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).        
 */ 
-#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
+#ifdef _WIN32
 # include "win32/config.h"
-#  include <windows.h>
+# include <windows.h>
 #else
 #  include "gras_config.h"
 #endif
@@ -73,6 +73,11 @@
 #  define O_BINARY 0
 #endif
 
+#ifdef HAVE_GETLINE
+#  define _GNU_SOURCE
+#  include <stdio.h>
+#endif
+
 /****
  **** Time handling
  ****/
@@ -88,18 +93,13 @@
 # endif
 #endif
 
-#ifdef _WIN32
-#define sleep _sleep /* else defined in stdlib.h */
-#endif
 
 /****
  **** Contexts
  ****/
 
 #ifdef USE_UCONTEXT
-# ifndef S_SPLINT_S /* This header drives splint into the wall */
-#   include <ucontext.h>
-# endif 
+# include <ucontext.h>
 #endif
 
 #ifdef _WIN32
@@ -163,31 +163,4 @@ extern int vasnprintf(char **ptr, size_t str_m, const char *fmt, va_list ap);
 void hexa_print(const char*name, unsigned char *data, int size);
 const char *hexa_str(unsigned char *data, int size, int downside);
 
-/* Windows __declspec(). */
-#if defined (_XBT_USE_DECLSPEC) /* using export/import technique */
-
-#    ifndef _XBT_EXPORT_DECLSPEC
-#        define _XBT_EXPORT_DECLSPEC
-#    endif
-
-#    ifndef _XBT_IMPORT_DECLSPEC
-#        define _XBT_IMPORT_DECLSPEC
-#    endif
-
-#    if defined (_XBT_DESIGNATED_DLL) /* this is a lib which will contain xbt exports */
-#        define  _XBT_DECLSPEC        _XBT_EXPORT_DECLSPEC 
-#    else
-#        define  _XBT_DECLSPEC        _XBT_IMPORT_DECLSPEC   /* other modules, importing xbt exports */
-#    endif
-
-#else /* not using DLL export/import specifications */
-
-#    define _XBT_DECLSPEC
-
-#endif /* #if defined (_XBT_USE_DECLSPEC) */
-
-#if !defined (_XBT_CALL)
-#define _XBT_CALL
-#endif
-
 #endif /* GRAS_PORTABLE_H */