diff mbox

api: debug: fix clang _ODP_STATIC_ASSERT

Message ID 1424110063-29888-1-git-send-email-mike.holmes@linaro.org
State Accepted
Commit afd775a839facbecbb94c6dd077b113f0a84044e
Headers show

Commit Message

Mike Holmes Feb. 16, 2015, 6:07 p.m. UTC
Clang has its own definition of Static_assert

Fixes https://bugs.linaro.org/show_bug.cgi?id=1203

Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
---
 include/odp/api/debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mike Holmes Feb. 19, 2015, 12:39 p.m. UTC | #1
ping

On 16 February 2015 at 13:07, Mike Holmes <mike.holmes@linaro.org> wrote:

> Clang has its own definition of Static_assert
>
> Fixes https://bugs.linaro.org/show_bug.cgi?id=1203
>
> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
> ---
>  include/odp/api/debug.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/odp/api/debug.h b/include/odp/api/debug.h
> index 5949680..660569f 100644
> --- a/include/odp/api/debug.h
> +++ b/include/odp/api/debug.h
> @@ -22,7 +22,7 @@ extern "C" {
>   *  @{
>   */
>
> -#ifdef __GNUC__
> +#if defined(__GNUC__) && !defined(__clang__)
>
>
>  #if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6))
> --
> 2.1.0
>
>
Anders Roxell Feb. 19, 2015, 12:52 p.m. UTC | #2
On 2015-02-16 13:07, Mike Holmes wrote:
> Clang has its own definition of Static_assert
> 
> Fixes https://bugs.linaro.org/show_bug.cgi?id=1203
> 
> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>

Reviewed-by: Anders Roxell <anders.roxell@linaro.org>

> ---
>  include/odp/api/debug.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/odp/api/debug.h b/include/odp/api/debug.h
> index 5949680..660569f 100644
> --- a/include/odp/api/debug.h
> +++ b/include/odp/api/debug.h
> @@ -22,7 +22,7 @@ extern "C" {
>   *  @{
>   */
>  
> -#ifdef __GNUC__
> +#if defined(__GNUC__) && !defined(__clang__)
>  
>  
>  #if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6))
> -- 
> 2.1.0
> 
> 
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
Maxim Uvarov Feb. 19, 2015, 3:21 p.m. UTC | #3
Merged!

Maxim.

On 02/19/2015 03:52 PM, Anders Roxell wrote:
> On 2015-02-16 13:07, Mike Holmes wrote:
>> Clang has its own definition of Static_assert
>>
>> Fixes https://bugs.linaro.org/show_bug.cgi?id=1203
>>
>> Signed-off-by: Mike Holmes <mike.holmes@linaro.org>
> Reviewed-by: Anders Roxell <anders.roxell@linaro.org>
>
>> ---
>>   include/odp/api/debug.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/odp/api/debug.h b/include/odp/api/debug.h
>> index 5949680..660569f 100644
>> --- a/include/odp/api/debug.h
>> +++ b/include/odp/api/debug.h
>> @@ -22,7 +22,7 @@ extern "C" {
>>    *  @{
>>    */
>>   
>> -#ifdef __GNUC__
>> +#if defined(__GNUC__) && !defined(__clang__)
>>   
>>   
>>   #if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6))
>> -- 
>> 2.1.0
>>
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> http://lists.linaro.org/mailman/listinfo/lng-odp
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
diff mbox

Patch

diff --git a/include/odp/api/debug.h b/include/odp/api/debug.h
index 5949680..660569f 100644
--- a/include/odp/api/debug.h
+++ b/include/odp/api/debug.h
@@ -22,7 +22,7 @@  extern "C" {
  *  @{
  */
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
 
 
 #if __GNUC__ < 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ < 6))