From: Eric Haszlakiewicz Date: Mon, 23 Oct 2017 02:19:41 +0000 (-0400) Subject: Issue #370: work around Clang-on-windows oddities by rearranging ifdefs. X-Git-Tag: json-c-0.13-20171207~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac09581cc277f0a437f4fb9e957257e334945f89;p=thirdparty%2Fjson-c.git Issue #370: work around Clang-on-windows oddities by rearranging ifdefs. --- diff --git a/json_object.h b/json_object.h index 7399be86..d1717de9 100644 --- a/json_object.h +++ b/json_object.h @@ -15,10 +15,10 @@ #ifdef __GNUC__ #define THIS_FUNCTION_IS_DEPRECATED(func) func __attribute__ ((deprecated)) -#elif defined(__clang__) -#define THIS_FUNCTION_IS_DEPRECATED(func) func __deprecated #elif defined(_MSC_VER) #define THIS_FUNCTION_IS_DEPRECATED(func) __declspec(deprecated) func +#elif defined(__clang__) +#define THIS_FUNCTION_IS_DEPRECATED(func) func __deprecated #else #define THIS_FUNCTION_IS_DEPRECATED(func) func #endif