openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPICA: MSVC6: Fix build issue for variable argument macros 

ACPICA commit 72f5a358f28c5d154ed613c142c7dca03192c5ee

This patch intoduces generic variable macro detection support and fixes
build breakage issue with macros using __VA_ARGS__ feature defined in
C99.

This patch fixes this build issue. Lv Zheng.

This patch doesn't affect Linux kernel.

Link: https://github.com/acpica/acpica/commit/72f5a358
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng 2015-07-01 14:43:43 +08:00 committed by Rafael J. Wysocki
parent 0ea6138178
commit 7b09d8fded
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/acpi/acoutput.h
View File

@ -294,8 +294,12 @@
/* DEBUG_PRINT functions */ /* DEBUG_PRINT functions */
#define ACPI_DEBUG_PRINT(plist) ACPI_ACTUAL_DEBUG plist #ifndef COMPILER_VA_MACRO
#define ACPI_DEBUG_PRINT_RAW(plist) ACPI_ACTUAL_DEBUG_RAW plist
#define ACPI_DEBUG_PRINT(plist) acpi_debug_print plist
#define ACPI_DEBUG_PRINT_RAW(plist) acpi_debug_print_raw plist
#else
/* Helper macros for DEBUG_PRINT */ /* Helper macros for DEBUG_PRINT */
@ -315,6 +319,11 @@
ACPI_DO_DEBUG_PRINT (acpi_debug_print_raw, level, line, \ ACPI_DO_DEBUG_PRINT (acpi_debug_print_raw, level, line, \
filename, modulename, component, __VA_ARGS__) filename, modulename, component, __VA_ARGS__)
#define ACPI_DEBUG_PRINT(plist) ACPI_ACTUAL_DEBUG plist
#define ACPI_DEBUG_PRINT_RAW(plist) ACPI_ACTUAL_DEBUG_RAW plist
#endif
/* /*
* Function entry tracing * Function entry tracing
* *

4
include/acpi/platform/acgcc.h
View File

@ -75,4 +75,8 @@
#undef strchr #undef strchr
#endif #endif
/* GCC supports __VA_ARGS__ in macros */
#define COMPILER_VA_MACRO 1
#endif /* __ACGCC_H__ */ #endif /* __ACGCC_H__ */