Merge pull request #3707 from lateralusX/jlorenss/win-api-family-support-libmonoutils

[mono.git] / mono / utils / mono-compiler.h

diff --git a/mono/utils/mono-compiler.h b/mono/utils/mono-compiler.h
index 04bc26e4f53ff3ef3796dc25ba3536144b6ba48d..7becf4816ffd571052129646b5c7c39ae7db4275 100644 (file)
--- a/mono/utils/mono-compiler.h
+++ b/mono/utils/mono-compiler.h
@@ -7,23 +7,16 @@
  */
 #include <config.h>
 
-/*
- * When embedding, you have to define MONO_ZERO_LEN_ARRAY before including any
- * other Mono header file if you use a different compiler from the one used to
- * build Mono.
- */
-#ifndef MONO_ZERO_LEN_ARRAY
 #ifdef __GNUC__
-#define MONO_ZERO_LEN_ARRAY 0
+#define MONO_ATTR_USED __attribute__ ((used))
 #else
-#define MONO_ZERO_LEN_ARRAY 1
-#endif
+#define MONO_ATTR_USED
 #endif
 
 #ifdef __GNUC__
-#define MONO_ATTR_USED __attribute__ ((used))
+#define MONO_ATTR_FORMAT_PRINTF(fmt_pos,arg_pos) __attribute__((format(printf,fmt_pos,arg_pos)))
 #else
-#define MONO_ATTR_USED
+#define MONO_ATTR_FORMAT_PRINTF(fmt_pos,arg_pos)
 #endif
 
 #ifdef HAVE_KW_THREAD
@@ -254,9 +247,6 @@
 #include <direct.h>
 #define mkdir(x)       _mkdir(x)
 
-/* GCC specific functions aren't available */
-#define __builtin_return_address(x)    NULL
-
 #define __func__ __FUNCTION__
 
 #include <BaseTsd.h>
@@ -288,12 +278,6 @@ typedef SSIZE_T ssize_t;
 #define MONO_LLVM_INTERNAL 
 #endif
 
-#if HAVE_DEPRECATED
-#define MONO_DEPRECATED __attribute__ ((deprecated))
-#else
-#define MONO_DEPRECATED 
-#endif
-
 #ifdef __GNUC__
 #define MONO_ALWAYS_INLINE __attribute__((always_inline))
 #elif defined(_MSC_VER)
@@ -316,5 +300,9 @@ typedef SSIZE_T ssize_t;
 #define MONO_COLD
 #endif
 
+#if defined (__GNUC__) && defined (__GNUC_MINOR__) && defined (__GNUC_PATCHLEVEL__)
+#define MONO_GNUC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+#endif
+
 #endif /* __UTILS_MONO_COMPILER_H__*/