From 7adf30e326ce076c64e0aff511bf6e583ceefda9 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Wed, 14 Mar 2018 17:11:51 +0700
Subject: [PATCH] Remove align.h.

---
 src/3rdparty/align.h       | 33 ---------------------------------
 src/Mem.h                  |  5 +----
 src/crypto/CryptoNight.h   |  8 +++-----
 src/workers/DoubleWorker.h |  1 -
 4 files changed, 4 insertions(+), 43 deletions(-)
 delete mode 100644 src/3rdparty/align.h

diff --git a/src/3rdparty/align.h b/src/3rdparty/align.h
deleted file mode 100644
index b61179b9..00000000
--- a/src/3rdparty/align.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XMRig
- * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
- * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
- * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
- * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
- * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
- * Copyright 2016-2017 XMRig       <support@xmrig.com>
- *
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __ALIGN_H__
-#define __ALIGN_H__
-
-#ifdef _MSC_VER
-#   define VAR_ALIGN(x, decl) __declspec(align(x)) decl
-#else
-#   define VAR_ALIGN(x, decl) decl __attribute__ ((aligned(x)))
-#endif
-
-#endif /* __ALIGN_H__ */
diff --git a/src/Mem.h b/src/Mem.h
index eaa4f49a..18914d68 100644
--- a/src/Mem.h
+++ b/src/Mem.h
@@ -30,9 +30,6 @@
 #include <stdint.h>
 
 
-#include "align.h"
-
-
 struct cryptonight_ctx;
 
 
@@ -63,7 +60,7 @@ private:
     static int m_threads;
     static size_t m_offset;
     static size_t m_size;
-    VAR_ALIGN(16, static uint8_t *m_memory);
+    alignas(16) static uint8_t *m_memory;
 
 #   ifndef XMRIG_NO_AEON
     static cryptonight_ctx *createLite(int threadId);
diff --git a/src/crypto/CryptoNight.h b/src/crypto/CryptoNight.h
index 9526309d..13e9c8e8 100644
--- a/src/crypto/CryptoNight.h
+++ b/src/crypto/CryptoNight.h
@@ -30,8 +30,6 @@
 #include <stdint.h>
 
 
-#include "align.h"
-
 #define AEON_MEMORY   1048576
 #define AEON_MASK     0xFFFF0
 #define AEON_ITER     0x40000
@@ -42,9 +40,9 @@
 
 
 struct cryptonight_ctx {
-    VAR_ALIGN(16, uint8_t state0[200]);
-    VAR_ALIGN(16, uint8_t state1[200]);
-    VAR_ALIGN(16, uint8_t* memory);
+    alignas(16) uint8_t state0[200];
+    alignas(16) uint8_t state1[200];
+    alignas(16) uint8_t* memory;
 };
 
 
diff --git a/src/workers/DoubleWorker.h b/src/workers/DoubleWorker.h
index 9f29fa5b..57be59d0 100644
--- a/src/workers/DoubleWorker.h
+++ b/src/workers/DoubleWorker.h
@@ -26,7 +26,6 @@
 #define __DOUBLEWORKER_H__
 
 
-#include "align.h"
 #include "net/Job.h"
 #include "net/JobResult.h"
 #include "workers/Worker.h"