Move the definition of XBT_PUBLIC from portable.h (which is a private header) to...

[simgrid.git] / include / xbt / misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index bdd9e92..a49fbf0 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -36,15 +36,69 @@
 
 #if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
 # define _XBT_FUNCTION __FUNCTION__
-# define _XBT_INLINE inline
 #elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
 # define _XBT_FUNC__ __func__      /* ISO-C99 compliant */
-# define _XBT_INLINE inline
 #else
 # define _XBT_FUNCTION "function"
-# define _XBT_INLINE 
 #endif
 
+#ifndef __cplusplus
+#    if defined(__GNUC__) && ! defined(__STRICT_ANSI__)
+#        define XBT_INLINE inline
+#    elif (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L)
+#        define XBT_INLINE inline
+#    elif defined(__BORLANDC__) && !defined(__STRICT_ANSI__)
+#        define XBT_INLINE __inline
+#    else
+#        define XBT_INLINE
+#    endif
+# else
+#    define XBT_INLINE  inline
+#endif
+
+/* Windows __declspec(). */
+#if defined(_WIN32) && defined(__BORLANDC__)
+#  if(__BORLANDC__ < 0x540)
+#    if (defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) || defined (_XBT_USE_DYNAMIC_LIB) ) && ! defined (_XBT_USE_STAT
+#      undef  _XBT_USE_DECLSPEC
+#      define _XBT_USE_DECLSPEC
+#    endif
+#  else
+#  if ( defined (__DLL) || defined (_DLL) || defined (_WINDLL) || defined (_RTLDLL) || defined(_AFXDLL) || defined (_XBT_USE_DYNAMIC_LIB) )
+#    undef  _XBT_USE_DECLSPEC
+#    define _XBT_USE_DECLSPEC 1
+#  endif
+#  endif
+#endif
+
+#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_PUBLIC        _XBT_EXPORT_DECLSPEC
+#    else
+#        define  XBT_PUBLIC        _XBT_IMPORT_DECLSPEC   /* other modules, importing xbt exports */
+#    endif
+
+#else /* not using DLL export/import specifications */
+
+#    define XBT_PUBLIC
+
+#endif /* #if defined (_XBT_USE_DECLSPEC) */
+
+/* Function calling convention (not used for now) */
+#if !defined (_XBT_CALL)
+#define _XBT_CALL
+#endif
+
+
 
 #ifndef max
 #  define max(a, b) (((a) > (b))?(a):(b))
@@ -78,7 +132,7 @@
 
 SG_BEGIN_DECL()
 
-const char *xbt_procname(void);
+XBT_PUBLIC const char *xbt_procname(void);
 
 #define XBT_BACKTRACE_SIZE 10 /* FIXME: better place? Do document */