From 389cff511328e788e1a71dbb78154dd7d21b5fcc Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Mon, 8 Jun 2009 17:11:47 +0000 Subject: [PATCH] Clean up FreeBSD-specific header file: - Define ACPI_USE_DO_WHILE_0 to add do while(0) around return_*() macros. - Define __cdecl only for user land. It will never be used in kernel. - Remove __cli() and __sti(). They were deprecated long ago. --- sys/contrib/dev/acpica/include/platform/acfreebsd.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/contrib/dev/acpica/include/platform/acfreebsd.h b/sys/contrib/dev/acpica/include/platform/acfreebsd.h index d3084eb2b05..ce647f3a471 100644 --- a/sys/contrib/dev/acpica/include/platform/acfreebsd.h +++ b/sys/contrib/dev/acpica/include/platform/acfreebsd.h @@ -125,11 +125,10 @@ #define ACPI_UINTPTR_T uintptr_t +#define ACPI_USE_DO_WHILE_0 #define ACPI_USE_LOCAL_CACHE #define ACPI_USE_SYSTEM_CLIBRARY -#define __cdecl - #ifdef _KERNEL #include @@ -168,12 +167,10 @@ #define ACPI_THREAD_ID pthread_t -/* Not building kernel code, so use libc */ #define ACPI_USE_STANDARD_HEADERS -#define ACPI_FLUSH_CPU_CACHE() -#define __cli() -#define __sti() +#define ACPI_FLUSH_CPU_CACHE() +#define __cdecl #endif /* _KERNEL */