From 63e8b9315e2ea9f50495ea738457cc7435bf01f2 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Mon, 2 Mar 2015 21:36:51 +0000 Subject: [PATCH] Fix -Werror warnings from clang 3.6.0 and higher about unused local typedefs, which are used for hand-implementing compile-time assertions, by adding an __unused__ attribute. Approved by: maintainer (swills) PR: 198202 --- .../files/patch-lib__include__vm_assert.h | 12 ++++++++++++ .../files/patch-lib__include__vm_atomic.h | 12 ++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 emulators/open-vm-tools/files/patch-lib__include__vm_assert.h create mode 100644 emulators/open-vm-tools/files/patch-lib__include__vm_atomic.h diff --git a/emulators/open-vm-tools/files/patch-lib__include__vm_assert.h b/emulators/open-vm-tools/files/patch-lib__include__vm_assert.h new file mode 100644 index 000000000000..e57afd5159be --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib__include__vm_assert.h @@ -0,0 +1,12 @@ +--- lib/include/vm_assert.h.orig 2013-09-23 17:51:10.000000000 +0200 ++++ lib/include/vm_assert.h 2015-02-04 15:55:56.011187000 +0100 +@@ -363,7 +363,8 @@ + #define ASSERT_ON_COMPILE(e) \ + do { \ + enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ typedef char AssertOnCompileFailed[AssertOnCompileMisused] \ ++ __attribute__((__unused__)); \ + } while (0) + + diff --git a/emulators/open-vm-tools/files/patch-lib__include__vm_atomic.h b/emulators/open-vm-tools/files/patch-lib__include__vm_atomic.h new file mode 100644 index 000000000000..b315ddb6fd36 --- /dev/null +++ b/emulators/open-vm-tools/files/patch-lib__include__vm_atomic.h @@ -0,0 +1,12 @@ +--- lib/include/vm_atomic.h.orig 2013-09-23 17:51:10.000000000 +0200 ++++ lib/include/vm_atomic.h 2015-02-04 16:28:59.372337000 +0100 +@@ -2460,7 +2460,8 @@ + && 8 * sizeof (out) == size \ + && 8 * sizeof (cast) == size \ + ? 1 : -1 }; \ +- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \ ++ typedef char AssertOnCompileFailed[AssertOnCompileMisused] \ ++ __attribute__((__unused__)); \ + } \ + \ + \