diff options
| author | Peter Jones <pjones@redhat.com> | 2024-12-17 11:00:07 -0500 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2024-12-17 13:35:41 -0500 |
| commit | 5f541823991d26f80f66f6e8e188c7cb246fe316 (patch) | |
| tree | 4fd4311f1d6245e783e4f44ab5caa79f39f8a5c8 | |
| parent | 3cf0e099b4066d6615ffa7d11e5b62428dd1c4d5 (diff) | |
| download | efi-boot-shim-5f541823991d26f80f66f6e8e188c7cb246fe316.tar.gz efi-boot-shim-5f541823991d26f80f66f6e8e188c7cb246fe316.zip | |
includes: work around CLANG_PREREQ() double-definition
Right now when doing test builds with clang, we wind up getting an error
from two different definitions of CLANG_PREREQ() in the headers.
It might be that we can just rip one of these out, but for now I'm just
making one of them conditional.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | include/compiler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/compiler.h b/include/compiler.h index 8e8a658d..982bc235 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -205,6 +205,7 @@ #define GNUC_PREREQ(maj, min) 0 #endif +#if !defined(CLANG_PREREQ) #if defined(__clang__) && defined(__clang_major__) && defined(__clang_minor__) #define CLANG_PREREQ(maj, min) \ ((__clang_major__ > (maj)) || \ @@ -212,6 +213,7 @@ #else #define CLANG_PREREQ(maj, min) 0 #endif +#endif /* CLANG_PREREQ */ #if GNUC_PREREQ(5, 1) || CLANG_PREREQ(3, 8) #define checked_add(addend0, addend1, sum) \ |