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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index 9b232f3ee6..6a5f341ec0 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -36,33 +36,115 @@
 
 #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) 
+ */
+ 
+#ifdef _WIN32
+#  ifndef _XBT_CALL
+#    define _XBT_CALL __cdecl
+#   endif
+#else 
+#  define _XBT_CALL
+#endif
 
-
-#ifndef max
-#  define max(a, b) (((a) > (b))?(a):(b))
+/* Handle import/export stuff
+ * 
+ * Rational of XBT_PUBLIC: 
+ *   * This is for library symbols visible from the application-land.
+ *     Basically, any symbols defined in the include/directory must be 
+ *     like this (plus some other globals). 
+ *
+ *     UNIX coders should just think of it as a special way to say "extern".
+ *
+ *   * If you build the DLL, define the DLL_EXPORT symbol so that all symbols
+ *     actually get exported by this file.
+
+ *   * If you do a static windows compilation, define DLL_STATIC, both when
+ *     compiling the application files and when compiling the library.
+ *
+ *   * If you link your application against the DLL or if you do a UNIX build,
+ *     don't do anything special. This file will do the right thing for you 
+ *     by default.
+ *
+ * 
+ * Rational of XBT_EXPORT_NO_IMPORT: (windows-only cruft)
+ *   * 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.
+ * 
+ * Rational of XBT_IMPORT_NO_EXPORT: (windows-only cruft)
+ *   * Symbols which must be imported from the DLL, but not explicitely 
+ *     exported from it.
+ * 
+ *   * The root log category is already exported, but not imported explicitely 
+ *     when creating a subcategory since we cannot import the parent category 
+ *     to deal with the fact that the parent may be in application space, not 
+ *     DLL space.
+ */
+
+
+/* Build the DLL */
+#if defined(DLL_EXPORT)
+#  define XBT_PUBLIC(type)            __declspec(dllexport) type
+#  define XBT_EXPORT_NO_IMPORT(type)  __declspec(dllexport) type
+#  define XBT_IMPORT_NO_EXPORT(type)  type 
+#  define XBT_PUBLIC_DATA(type)	      __declspec(dllexport) type
+
+/* Pack everything up statically */
+#elif defined(DLL_STATIC)
+#  define XBT_PUBLIC(type)            type
+#  define XBT_EXPORT_NO_IMPORT(type)  type
+#  define XBT_IMPORT_NO_EXPORT(type)  type
+#  define XBT_PUBLIC_DATA(type)       type
+     
+
+/* Link against the DLL */
+#elif (defined(_WIN32) && !defined(DLL_EXPORT))
+#  define XBT_PUBLIC(type)            	__declspec(dllimport) type
+#  define XBT_EXPORT_NO_IMPORT(type)  	type
+#  define XBT_IMPORT_NO_EXPORT(type)  	__declspec(dllimport) type
+#  define XBT_PUBLIC_DATA(type)		__declspec(dllimport) type
+
+/* UNIX build. Let's keep sain here ;) */
+#else
+#  define XBT_PUBLIC(type)            extern type
+#  define XBT_EXPORT_NO_IMPORT(type)  type
+#  define XBT_IMPORT_NO_EXPORT(type)  type
+#  define XBT_PUBLIC_DATA(type)       type
 #endif
-#ifndef min
-#  define min(a, b) (((a) < (b))?(a):(b))
+   
+#if !defined (max) && !defined(__cplusplus)
+#  define max(a,b)	(((a) > (b)) ? (a) : (b))
+#endif
+#if !defined (min) && !defined(__cplusplus)
+#  define min(a,b)	(((a) < (b)) ? (a) : (b))
 #endif
 
 #define TRUE  1
@@ -78,7 +160,6 @@
 # endif
 #endif
 
-/*! C++ users need love */
 #ifndef SG_END_DECL
 # ifdef __cplusplus
 #  define SG_END_DECL() }
@@ -90,10 +171,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 */
+
+
+
+