Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b09d8fd authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

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: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0ea61381

include/acpi/acoutput.h

+11 −2
Original line number Diff line number Diff line
@@ -294,8 +294,12 @@ 


/* DEBUG_PRINT functions */



#define ACPI_DEBUG_PRINT(plist)         ACPI_ACTUAL_DEBUG plist

#define ACPI_DEBUG_PRINT_RAW(plist)     ACPI_ACTUAL_DEBUG_RAW plist

#ifndef COMPILER_VA_MACRO



#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 */
@@ -315,6 +319,11 @@ 
	ACPI_DO_DEBUG_PRINT (acpi_debug_print_raw, level, line, \

		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

 *

include/acpi/platform/acgcc.h

+4 −0
Original line number Diff line number Diff line
@@ -75,4 +75,8 @@ 
#undef strchr

#endif



/* GCC supports __VA_ARGS__ in macros */



#define COMPILER_VA_MACRO               1



#endif				/* __ACGCC_H__ */