X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/db93cd1c0fc7fed756efeb7ffad21d553f41be97..305fbc7b720f845588b22de910245576971a5f97:/src/portable.h

diff --git a/src/portable.h b/src/portable.h
index 99de0b81ec..aef3db02e7 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -24,7 +24,9 @@
 
 /* Load this asap to make sure that GNU_SOURCE is defined on need when stdio gets loaded by some random system header */
 #ifdef HAVE_GETLINE
-#  define _GNU_SOURCE
+#  ifndef _GNU_SOUCE
+#    define _GNU_SOURCE
+#  endif
 #  include <stdio.h>
 #endif
 
@@ -124,7 +126,7 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list
 #endif
 
 /* prototype of GNU functions  */
-#if defined(__GNUC__)
+#if (defined(__GNUC__) && !defined(__cplusplus))
 extern int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
 extern int vasprintf (char **ptr, const char *fmt, va_list ap);
 #endif
@@ -156,20 +158,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);
 
-
-#if defined(WIN32)
-/* Visual C++ does not implements the gettimeofday() function */
-XBT_PUBLIC(int)
-gettimeofday(struct timeval *tv, struct timezone *tz);
-#endif
-
-#define HAVE_SEM_TIMEDWAIT	1
-
-/* mac osx doesn't have the sem_timedwait() function */
-#if defined(__GNUC__) && ( defined(__APPLE_CPP__) || defined(__APPLE_CC__) || defined(__MACOS_CLASSIC__) )
-#
-# undef HAVE_SEM_TIMEDWAIT
-#
-#endif
-
 #endif /* GRAS_PORTABLE_H */