From 26682497b29a3eeb2d08eae44a4bef73a17a08fc Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 24 Sep 2007 14:23:36 +0000
Subject: [PATCH] Cleanup of the portability between win and lin at header
 level

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4698 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/portable.h               | 19 ++++++-------------
 src/win32/compiler/visualc.h |  8 +++++++-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/portable.h b/src/portable.h
index a6a02209a9..f56b81db8f 100644
--- a/src/portable.h
+++ b/src/portable.h
@@ -11,6 +11,7 @@
 #ifndef GRAS_PORTABLE_H
 #define GRAS_PORTABLE_H
 
+#include "xbt/misc.h"
 /* 
  * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).	
 */ 
@@ -106,22 +107,14 @@
  ****/
 
 /* prototype of C99 functions */
-#if defined(HAVE_SNPRINTF) && defined(_MSC_VER)
+#if defined(HAVE_SNPRINTF)
 #include <stdio.h>
 #else
-#  if (defined(_MSC_VER) && defined(DLL_EXPORT))
-     __declspec(dllexport) int snprintf(char *, size_t, const char *, /*args*/ ...);
-     __declspec(dllexport)  int vsnprintf(char *, size_t, const char *, va_list);
-#  elif (defined(_MSC_VER) && !defined(DLL_EXPORT) && !defined(DLL_STATIC) )
-     __declspec(dllimport) int snprintf(char *, size_t, const char *, /*args*/ ...);
-     __declspec(dllimport)  int vsnprintf(char *, size_t, const char *, va_list);
-#  else
-     extern int snprintf(char *, size_t, const char *, /*args*/ ...);
-     extern int vsnprintf(char *, size_t, const char *, va_list);
-#  endif
-
+   XBT_PUBLIC(int) snprintf(char *, size_t, const char *, /*args*/ ...);
+   XBT_PUBLIC(int) vsnprintf(char *, size_t, const char *, va_list);
 #endif
 
+
 /* 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, /*args*/ ...);
@@ -131,7 +124,7 @@ extern int portable_vsnprintf(char *str, size_t str_m, const char *fmt, va_list
 #endif
 
 /* prototype of GNU functions  */
-#if !defined(__BORLANDC__) && !defined(_MSC_VER)
+#if defined(__GNUC__)
 extern int asprintf  (char **ptr, const char *fmt, /*args*/ ...);
 extern int vasprintf (char **ptr, const char *fmt, va_list ap);
 #endif
diff --git a/src/win32/compiler/visualc.h b/src/win32/compiler/visualc.h
index adb89054dc..3833296bd4 100644
--- a/src/win32/compiler/visualc.h
+++ b/src/win32/compiler/visualc.h
@@ -165,8 +165,14 @@
 #endif
 
 /* The compiler has `snprintf' function. */
-#ifndef HAVE_SNPRINTF
+#if _MSC_VER >= 7 /* FIXME: check version number */
+#  ifndef HAVE_SNPRINTF
 	#define HAVE_SNPRINTF	1
+#  endif
+#else 
+#  ifdef HAVE_SNPRINTF
+	#undef HAVE_SNPRINTF
+#  endif
 #endif
 
 /* No `swapcontext' function. */
-- 
2.20.1