X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d7515d47fd9d644de5a2366aa214c05ace3c89c2..023d86f78c882708358c37d7ba9b63aeda514643:/include/xbt/misc.h

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 9b232f3ee6..256f4ecc3e 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -36,25 +36,77 @@
 
 #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
+#    define XBT_INLINE  inline
+#endif
+
+/* 
+ * Function calling convention (not used for now) 
+ */
+ 
+#ifdef _WIN32
+#  ifndef _XBT_CALL
+#    define _XBT_CALL __cdecl
+#   endif
+#else 
+#  define _XBT_CALL
+#endif
+
+/* Handle import/export stuff
+ * 
+ * Rational of XBT_PUBLIC: 
+ *   * 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
+ * 
+ * Rational of XBT_PUBLIC_NO_IMPORT:
+ *   * This is for symbols which must be exported in the DLL, but not imported from it. 
+ *     This is obviously useful for initialized globals (which cannot be extern or similar).
+ *     This is also used in the log mecanism where a macro creates the variable automatically.
+ *      When the macro is called from within SimGrid, the symbol must be exported, but when called 
+ *      from within the client code, it must not try to retrieve the symbol from the DLL since it's not in there.
+ */
+
+
+#ifdef DLL_EXPORT
+#  define XBT_PUBLIC(type)			  __declspec(dllexport) type
+#  define XBT_PUBLIC_NO_IMPORT(type)  __declspec(dllexport) type
+#  define XBT_IMPORT_NO_PUBLIC(type)  type 
 #else
-# define XBT_EXPORT
+#  ifdef DLL_STATIC
+#    define XBT_PUBLIC(type)		   type
+#    define XBT_PUBLIC_NO_IMPORT(type) type
+#   define XBT_IMPORT_NO_PUBLIC(type)  type 
+#  else
+#    ifdef _WIN32
+#      define XBT_PUBLIC(type)		     __declspec(dllimport) type
+#      define XBT_PUBLIC_NO_IMPORT(type) type
+#      define XBT_IMPORT_NO_PUBLIC(type) __declspec(dllimport) type
+#  	 else
+#      define XBT_PUBLIC(type)		     extern type
+#      define XBT_PUBLIC_NO_IMPORT(type) type
+#      define XBT_IMPORT_NO_PUBLIC(type) type
+#    endif
+#  endif
 #endif
+   
 
 
 
@@ -90,10 +142,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 */
+
+
+
+