diff options
| author | Yiwei Zhang <zzyiwei@chromium.org> | 2023-06-18 22:59:17 -0700 |
|---|---|---|
| committer | Yiwei Zhang <zzyiwei@chromium.org> | 2023-06-18 23:13:36 -0700 |
| commit | e51d1ddea0a60969154d1d2f7996c92d3e605006 (patch) | |
| tree | 4c1fb8de6db3c0882c7791aac4c11a9a389ef5c4 | |
| parent | 05a2987670cfe5ced0cb9d5f6abfb6073400005c (diff) | |
drm: fix build failure and misc .clang-format issue
drm_log relies on -Wgnu-zero-variadic-macro-arguments ignored.
Fixes: 060f4481 ("drm: Silence GCC warnings")
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1165>
| -rw-r--r-- | src/drm/.clang-format | 1 | ||||
| -rw-r--r-- | src/drm/drm_util.h | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/drm/.clang-format b/src/drm/.clang-format index 068b217..885f701 100644 --- a/src/drm/.clang-format +++ b/src/drm/.clang-format @@ -19,7 +19,6 @@ BreakBeforeBraces: Custom ColumnLimit: 90 ContinuationIndentWidth: 3 Cpp11BracedListStyle: false -Cpp11BracedListStyle: true BreakStringLiterals: false ForEachMacros: - BITSET_FOREACH_SET diff --git a/src/drm/drm_util.h b/src/drm/drm_util.h index 540a07a..00f87d6 100644 --- a/src/drm/drm_util.h +++ b/src/drm/drm_util.h @@ -21,11 +21,11 @@ #include "linux/overflow.h" -#pragma GCC diagnostic pop - void _drm_log(const char *fmt, ...); #define drm_log(fmt, ...) _drm_log("%s:%d: " fmt, __func__, __LINE__, ##__VA_ARGS__) +#pragma GCC diagnostic pop + #if 0 #define drm_dbg drm_log #else |