Skip to content

Commit 7a74890

Browse files
committed
Merge branch 'acpi-tools'
Merge a fix for a recent ACPI tools bild regresson. * acpi-tools: ACPI: tools: fix compilation error
2 parents bc28368 + 136f282 commit 7a74890

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

include/acpi/platform/acgcc.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,14 @@ typedef __builtin_va_list va_list;
2222
#define va_arg(v, l) __builtin_va_arg(v, l)
2323
#define va_copy(d, s) __builtin_va_copy(d, s)
2424
#else
25+
#ifdef __KERNEL__
2526
#include <linux/stdarg.h>
26-
#endif
27-
#endif
27+
#else
28+
/* Used to build acpi tools */
29+
#include <stdarg.h>
30+
#endif /* __KERNEL__ */
31+
#endif /* ACPI_USE_BUILTIN_STDARG */
32+
#endif /* ! va_arg */
2833

2934
#define ACPI_INLINE __inline__
3035

0 commit comments

Comments
 (0)