X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..9bcf7dd5948ad1781a7ff203bb04e21b1dceebc7:/include/xbt/base.h?ds=sidebyside

diff --git a/include/xbt/base.h b/include/xbt/base.h
index a1fa3696ba..466e7a5928 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -13,7 +13,7 @@
 
 /* Define _GNU_SOURCE for getline, isfinite, etc. */
 #ifndef _GNU_SOURCE
-	#define _GNU_SOURCE
+  #define _GNU_SOURCE
 #endif
 
 /* Attributes are only in recent versions of GCC */
@@ -179,9 +179,6 @@
  *
  *   * 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
@@ -218,17 +215,8 @@
 #  define XBT_PUBLIC_CLASS            class __declspec(dllexport)
 #  define XBT_PRIVATE
 
-/* 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)       extern type
-#  define XBT_PUBLIC_CLASS            class
-#  define XBT_PRIVATE
-
 /* Link against the DLL */
-#elif (defined(_XBT_WIN32) && !defined(DLL_EXPORT) && !defined(DLL_STATIC))
+#elif (defined(_XBT_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
@@ -255,18 +243,18 @@
 #endif
 
 #ifdef _MSC_VER /* MSVC has no ssize_t, and I fail to use the SSIZE_T declared in BaseTsd.h */
-	#if defined(_WIN64)
-		typedef __int64 ssize_t;
-	#else
-		typedef long ssize_t;
-	#endif
+  #if defined(_WIN64)
+    typedef __int64 ssize_t;
+  #else
+    typedef long ssize_t;
+  #endif
 
 /* Microsoft wants to improve the code quality blah blah blah */
 /* See: https://msdn.microsoft.com/en-us/library/8ef0s5kh.aspx */
-	/* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
-	#define _CRT_NONSTDC_NO_WARNINGS
-	/* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
-	#define _CRT_SECURE_NO_WARNINGS
+  /* warning C4996: '_strdup': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. */
+  #define _CRT_NONSTDC_NO_WARNINGS
+  /* warning C4996: 'fopen': This function or variable may be unsafe. Consider using fopen_s instead. */
+  #define _CRT_SECURE_NO_WARNINGS
 #endif
 
 #if !defined (max) && !defined(__cplusplus)