sorry a stupid error

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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 9b232f3..81b87d0 100644 (file)
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -36,26 +36,55 @@
 
 #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
 
-/* The cruft needed to export data in DLLs */
-#ifdef _WIN32
-# ifdef DLL_EXPORT 
-#  define XBT_EXPORT __declspec(dllexport) /* building the DLL */
+#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_EXPORT extern __declspec(dllimport) /* using the DLL */
-# endif
-#else
-# define XBT_EXPORT
+#    define XBT_INLINE  inline
+#endif
+
+/* 
+ * Function calling convention (not used for now) 
+ */
+#if !defined (_XBT_CALL)
+#define _XBT_CALL
 #endif
 
+/* Handle import/export stuff
+ * Rational: 
+ *   * If you build the DLL you must pass the right value of XBT_PUBLIC in the project : to do this you must define the DLL_EXPORT macro
+ *   * If you do a static compilation, you must define the macro DLL_STATIC
+ *   * If you link your code against the DLL, this file defines the macro to '__declspec(dllimport)' for you
+ *   * If you compile under unix, this file defines the macro to 'extern', even if it's not mandatory with modern compilers
+ */
+
+#ifdef DLL_EXPORT
+#  define XBT_PUBLIC(type)                     __declspec(dllexport) type
+#else
+#  ifdef DLL_STATIC
+#    define XBT_PUBLIC(type)           type
+#  else
+#    ifdef _WIN32
+#      define XBT_PUBLIC(type)         __declspec(dllimport) type 
+#       else
+#      define XBT_PUBLIC(type)         extern type
+#    endif
+#  endif
+#endif    
+
 
 
 #ifndef max
@@ -90,10 +119,14 @@
 
 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 */
    
 SG_END_DECL()
 
 #endif /* XBT_MISC_H */
+
+
+
+