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

diff --git a/include/xbt/misc.h b/include/xbt/misc.h
index a49fbf0b31..24ea9c680b 100644
--- a/include/xbt/misc.h
+++ b/include/xbt/misc.h
@@ -56,55 +56,95 @@
 #    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
+/* 
+ * Function calling convention (not used for now) 
+ */
+ 
+#ifdef _WIN32
+#  ifndef _XBT_CALL
+#    define _XBT_CALL __cdecl
+#   endif
+#else 
+#  define _XBT_CALL
 #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
+/* 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			 __declspec(dllexport)
+
+/* 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		  
+     
+
+/* 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				__declspec(dllimport)		
+
+/* Non-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       
 #endif
-
-
-
-#ifndef max
-#  define max(a, b) (((a) > (b))?(a):(b))
+   
+#if !defined (max) && !defined(__cplusplus)
+#  define max(a,b)	(((a) > (b)) ? (a) : (b))
 #endif
-#ifndef min
-#  define min(a, b) (((a) < (b))?(a):(b))
+#if !defined (min) && !defined(__cplusplus)
+#  define min(a,b)	(((a) < (b)) ? (a) : (b))
 #endif
 
 #define TRUE  1
@@ -120,7 +160,6 @@
 # endif
 #endif
 
-/*! C++ users need love */
 #ifndef SG_END_DECL
 # ifdef __cplusplus
 #  define SG_END_DECL() }
@@ -132,10 +171,14 @@
 
 SG_BEGIN_DECL()
 
-XBT_PUBLIC 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 */
+
+
+
+