diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/endian.h | 10 | ||||
| -rw-r--r-- | include/test.mk | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/endian.h b/include/endian.h index 267fbf00..1c4a21de 100644 --- a/include/endian.h +++ b/include/endian.h @@ -3,9 +3,11 @@ * endian.h - bswap decls that can't go in compiler.h * Copyright Peter Jones <pjones@redhat.com> */ - -#ifndef ENDIAN_H_ -#define ENDIAN_H_ +#ifdef SHIM_UNIT_TEST +#include_next <endian.h> +#endif +#ifndef SHIM_ENDIAN_H_ +#define SHIM_ENDIAN_H_ #include <stdint.h> @@ -15,5 +17,5 @@ mkbi1_(uint32_t, bswap32, uint32_t, x) mkbi1_(uint64_t, bswap64, uint64_t, x) #include "system/builtins_end_.h" -#endif /* !ENDIAN_H_ */ +#endif /* !SHIM_ENDIAN_H_ */ // vim:fenc=utf-8:tw=75:noet diff --git a/include/test.mk b/include/test.mk index 5d74bdc2..62cf983a 100644 --- a/include/test.mk +++ b/include/test.mk @@ -21,7 +21,7 @@ CFLAGS = -O2 -ggdb -std=gnu11 \ -Wno-unused \ -Werror \ -Werror=nonnull \ - -Werror=nonnull-compare \ + $(shell $(CC) -Werror=nonnull-compare -E -x c /dev/null >/dev/null 2>&1 && echo -Werror=nonnull-compare) \ $(ARCH_DEFINES) \ -DEFI_FUNCTION_WRAPPER \ -DGNU_EFI_USE_MS_ABI -DPAGE_SIZE=4096 \ |