ACPICA: MacOSX: Fix wrong sem_destroy definition
authorLv Zheng <zetalog@gmail.com>
Mon, 17 Oct 2016 19:03:01 +0000 (03:03 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Oct 2016 23:33:39 +0000 (01:33 +0200)
ACPICA commit bbcb58f7875381d5c7f3d614bad3bc628a3f5cc6

The following build errors can be seen for MacOSX builds:
.../osunixxf.c:882:9: error: 'sem_close' is deprecated [-Werror,-Wdeprecated-declarations]
.../acmacosx.h:122:29: note: expanded from macro 'sem_destroy'
#define sem_destroy         sem_close

sem_destroy() issue is caused by the wrong order of the following lines:
  #define #sem_destroy        sem_close
  #include <semaphore.h>
This patch fixes it by removing the buggy re-definitiion. Lv Zheng.

Linux is not affected by this change.

Link: https://github.com/acpica/acpica/commit/bbcb58f7
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>
tools/power/acpi/os_specific/service_layers/osunixxf.c

index 8f5ded8..10648aa 100644 (file)
@@ -696,10 +696,15 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)
        if (!sem) {
                return (AE_BAD_PARAMETER);
        }
-
+#ifdef __APPLE__
+       if (sem_close(sem) == -1) {
+               return (AE_BAD_PARAMETER);
+       }
+#else
        if (sem_destroy(sem) == -1) {
                return (AE_BAD_PARAMETER);
        }
+#endif
 
        return (AE_OK);
 }