diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2019-07-10 09:46:25 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2019-07-10 09:46:25 +0000 |
| commit | caaa131d8a8e96c24a1f5338b3eeaf27c7a8e7db (patch) | |
| tree | a48ab851a00dab91b582d016476de16f8596f174 | |
| parent | 45a21dcc3ac42e8bd07817aa0f75f0b9b80b5390 (diff) | |
| parent | d616ca25ffebdf5dc39746537546d1b67e661d34 (diff) | |
| download | glib-caaa131d8a8e96c24a1f5338b3eeaf27c7a8e7db.tar.gz | |
Merge branch 'gmacros-h-support-clang-cl' into 'master'
gmacros.h: Add better support for clang-cl
See merge request GNOME/glib!980
| -rw-r--r-- | glib/gmacros.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/glib/gmacros.h b/glib/gmacros.h index 2764d9552..79077e23b 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -581,7 +581,7 @@ * * Since: 2.2 */ -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || defined (__clang__) #define G_GNUC_DEPRECATED __attribute__((__deprecated__)) #else #define G_GNUC_DEPRECATED @@ -610,7 +610,7 @@ * * Since: 2.26 */ -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || defined (__clang__) #define G_GNUC_DEPRECATED_FOR(f) \ __attribute__((deprecated("Use " #f " instead"))) #else @@ -629,7 +629,7 @@ _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") #define G_GNUC_END_IGNORE_DEPRECATIONS \ _Pragma ("GCC diagnostic pop") -#elif defined (_MSC_VER) && (_MSC_VER >= 1500) +#elif defined (_MSC_VER) && (_MSC_VER >= 1500) && !defined (__clang__) #define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ __pragma (warning (push)) \ __pragma (warning (disable : 4996)) @@ -938,7 +938,7 @@ #define G_UNLIKELY(expr) (expr) #endif -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1) || defined (__clang__) #define G_DEPRECATED __attribute__((__deprecated__)) #elif defined(_MSC_VER) && (_MSC_VER >= 1300) #define G_DEPRECATED __declspec(deprecated) @@ -946,7 +946,7 @@ #define G_DEPRECATED #endif -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || defined (__clang__) #define G_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead"))) #elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320) #define G_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead")) @@ -954,7 +954,7 @@ #define G_DEPRECATED_FOR(f) G_DEPRECATED #endif -#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || defined (__clang__) #define G_UNAVAILABLE(maj,min) __attribute__((deprecated("Not available before " #maj "." #min))) #elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320) #define G_UNAVAILABLE(maj,min) __declspec(deprecated("is not available before " #maj "." #min)) @@ -1021,7 +1021,7 @@ #ifndef __GI_SCANNER__ -#ifdef __GNUC__ +#if defined (__GNUC__) || defined (__clang__) /* these macros are private */ #define _GLIB_AUTOPTR_FUNC_NAME(TypeName) glib_autoptr_cleanup_##TypeName |