diff options
| author | Steve McIntyre <steve@einval.com> | 2021-03-15 23:12:08 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-03-15 19:52:17 -0400 |
| commit | f5a3de3264f87f48186f80297fb1dbcddfd6d945 (patch) | |
| tree | 59dc7788c047dd9552c307d90f0d5d788b72587f | |
| parent | 2d1d11567f9706a703d22d0d17996cb81c5ae4de (diff) | |
| download | efi-boot-shim-f5a3de3264f87f48186f80297fb1dbcddfd6d945.tar.gz efi-boot-shim-f5a3de3264f87f48186f80297fb1dbcddfd6d945.zip | |
Fix up build of test code using gcc 8
Don't check SHIM_UNIT_TEST.
This fixes conflicting declarations for __builtin_ms_va_list on amd64:
In file included from shim.h:47,
from test.c:10:
../include/system/stdarg.h:30:27: error: conflicting types for '__builtin_ms_va_list'
typedef __builtin_va_list __builtin_ms_va_list;
^~~~~~~~~~~~~~~~~~~~
cc1: note: previous declaration of '__builtin_ms_va_list' was here
In file included from shim.h:47,
from test-csv.c:9:
../include/system/stdarg.h:30:27: error: conflicting types for '__builtin_ms_va_list'
typedef __builtin_va_list __builtin_ms_va_list;
^~~~~~~~~~~~~~~~~~~~
cc1: note: previous declaration of '__builtin_ms_va_list' was here
In file included from shim.h:47,
from csv.c:6:
../include/system/stdarg.h:30:27: error: conflicting types for '__builtin_ms_va_list'
typedef __builtin_va_list __builtin_ms_va_list;
^~~~~~~~~~~~~~~~~~~~
cc1: note: previous declaration of '__builtin_ms_va_list' was here
Signed-off-by: Steve McIntyre <93sam@debian.org>
| -rw-r--r-- | include/system/stdarg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/system/stdarg.h b/include/system/stdarg.h index ce722249..4c956f70 100644 --- a/include/system/stdarg.h +++ b/include/system/stdarg.h @@ -24,7 +24,7 @@ typedef __builtin_va_list __builtin_sysv_va_list; #endif #if defined(__aarch64__) || defined(__arm__) || defined(__i386__) || \ - defined(__i486__) || defined(__i686__) || defined(SHIM_UNIT_TEST) + defined(__i486__) || defined(__i686__) typedef __builtin_va_list ms_va_list; typedef __builtin_va_list __builtin_ms_va_list; |