From 871dd2743bbbf179feb802ca3239ddd1839773f3 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 12 Mar 2018 19:35:25 +0100 Subject: [PATCH] __STDC_VERSION__ may be undefined Clang++ (and g++) don't define __STDC_VERSION__ which results in include/spa/support/log.h:101:5: error: '__STDC_VERSION__' is not defined, evaluates to 0 [-Werror,-Wundef] #if __STDC_VERSION__ >= 199901L include/pipewire/log.h:64:5: error: '__STDC_VERSION__' is not defined, evaluates to 0 [-Werror,-Wundef] #if __STDC_VERSION__ >= 199901L so check if __STDC_VERSION__ is defined before comparing. Also, include/feature.h additionally defines __USE_ISOC99 (and __USE_ISOC11 for C11 extension), so check these as well. --- spa/include/spa/support/log.h | 3 ++- src/pipewire/log.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/spa/include/spa/support/log.h b/spa/include/spa/support/log.h index dfce08c02..57e2b01f1 100644 --- a/spa/include/spa/support/log.h +++ b/spa/include/spa/support/log.h @@ -98,7 +98,8 @@ struct spa_log { #define spa_log_level_enabled(l,lev) ((l) && (l)->level >= (lev)) -#if __STDC_VERSION__ >= 199901L +#if defined(__USE_ISOC11) || defined(__USE_ISOC99) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) #define spa_log_log(l,lev,...) \ if (SPA_UNLIKELY (spa_log_level_enabled (l, lev))) \ diff --git a/src/pipewire/log.h b/src/pipewire/log.h index 03c875154..43b97582f 100644 --- a/src/pipewire/log.h +++ b/src/pipewire/log.h @@ -61,7 +61,8 @@ pw_log_logv(enum spa_log_level level, /** Check if a loglevel is enabled \memberof pw_log */ #define pw_log_level_enabled(lev) (pw_log_level >= (lev)) -#if __STDC_VERSION__ >= 199901L +#if defined(__USE_ISOC11) || defined(__USE_ISOC99) || \ + (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) #define pw_log_logc(lev,...) \ if (SPA_UNLIKELY(pw_log_level_enabled (lev))) \