From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 2 Nov 2018 22:28:22 +0000 (-0700)
Subject: Backout immediately previous change; not applicable to open-vm-tools.
X-Git-Tag: stable-11.0.0~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55e6cb43d4a67b7e5ab2385f8decdaa4e0a1ad5f;p=thirdparty%2Fopen-vm-tools.git

Backout immediately previous change; not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h
index 6db294a11..8bcb77404 100644
--- a/open-vm-tools/lib/include/vm_atomic.h
+++ b/open-vm-tools/lib/include/vm_atomic.h
@@ -122,25 +122,21 @@ extern "C" {
 
 
 /* Basic atomic types: 8, 16, 32, 64 and 128 bits */
-ALIGN_PREFIX(1)
 typedef struct Atomic_uint8 {
    volatile uint8 value;
-} Atomic_uint8 ALIGN_SUFFIX(1);
+} Atomic_uint8 ALIGNED(1);
 
-ALIGN_PREFIX(2)
 typedef struct Atomic_uint16 {
    volatile uint16 value;
-} Atomic_uint16 ALIGN_SUFFIX(2);
+} Atomic_uint16 ALIGNED(2);
 
-ALIGN_PREFIX(4)
 typedef struct Atomic_uint32 {
    volatile uint32 value;
-} Atomic_uint32 ALIGN_SUFFIX(4);
+} Atomic_uint32 ALIGNED(4);
 
-ALIGN_PREFIX(8)
 typedef struct Atomic_uint64 {
    volatile uint64 value;
-} Atomic_uint64 ALIGN_SUFFIX(8);
+} Atomic_uint64 ALIGNED(8);
 
 #if defined __GNUC__ && defined VM_64BIT && \
      (defined __GCC_HAVE_SYNC_COMPARE_AND_SWAP_16 || defined VM_ARM_64)