fix windows build

Author: fancyIX

ccminer.vcxproj

@@ -261,6 +261,8 @@
     <ClCompile Include="lyra2\Lyra2.c" />
     <ClCompile Include="lyra2\Sponge.c" />
     <ClCompile Include="lyra2\Lyra2Z.c" />
+    <ClCompile Include="heavyhash/heavyhash-gate.c" />
+    <ClCompile Include="heavyhash/keccak_tiny.c" />
     <ClInclude Include="equi\eqcuda.hpp" />
     <ClInclude Include="neoscrypt\neoscrypt.h" />
     <ClCompile Include="neoscrypt\neoscrypt.cpp" />
@@ -390,6 +392,8 @@
     <ClInclude Include="lyra2\Lyra2.h" />
     <ClInclude Include="lyra2\Sponge.h" />
     <ClInclude Include="lyra2\Lyra2Z.h" />
+    <ClInclude Include="heavyhash/heavyhash-gate.h" />
+    <ClInclude Include="heavyhash/keccak_tiny.h" />
     <ClInclude Include="quark\groestl_transf_quad.h" />
     <ClInclude Include="quark\groestl_functions_quad.h" />
     <ClInclude Include="quark\cuda_quark.h" />

ccminer.vcxproj.filters

@@ -270,6 +270,12 @@
     <ClCompile Include="lyra2\Lyra2Z.c">
       <Filter>Source Files\sph</Filter>
     </ClCompile>
+    <ClCompile Include="heavyhash/heavyhash-gate.c">
+      <Filter>Source Files\heavyhash</Filter>
+    </ClCompile>
+    <ClCompile Include="heavyhash/keccak_tiny.c">
+      <Filter>Source Files\heavyhash</Filter>
+    </ClCompile>
     <ClCompile Include="scrypt.cpp">
       <Filter>Source Files\CUDA\scrypt</Filter>
     </ClCompile>
@@ -506,6 +512,12 @@
     <ClInclude Include="lyra2\Lyra2Z.h">
       <Filter>Header Files\lyra2</Filter>
     </ClInclude>
+    <ClInclude Include="heavyhash/heavyhash-gate.h">
+      <Filter>Source Files\heavyhash</Filter>
+    </ClInclude>
+    <ClInclude Include="heavyhash/keccak_tiny.h">
+      <Filter>Source Files\heavyhash</Filter>
+    </ClInclude>
     <ClInclude Include="lyra2\Sponge.h">
       <Filter>Header Files\lyra2</Filter>
     </ClInclude>
@@ -971,10 +983,10 @@
       <Filter>Source Files\CUDA</Filter>
     </CudaCompile>
     <CudaCompile Include="heavyhash/heavyhash.cu">
-      <Filter>Source Files\CUDA</Filter>
+      <Filter>Source Files\CUDA\heavyhash</Filter>
     </CudaCompile>
     <CudaCompile Include="heavyhash/cuda_heavyhash.cu">
-      <Filter>Source Files\CUDA</Filter>
+      <Filter>Source Files\CUDA\heavyhash</Filter>
     </CudaCompile>
   </ItemGroup>
   <ItemGroup>

heavyhash/heavyhash-gate.c

@@ -9,8 +9,6 @@
 #include <math.h>
 #include <stdbool.h>
 
-#define bswap_32( a ) __builtin_bswap32( a )
-
 static inline void mm128_bswap32_80( void *d, void *s )
 {
   ( (uint32_t*)d )[ 0] = bswap_32( ( (uint32_t*)s )[ 0] );
@@ -77,7 +75,7 @@ static int compute_rank(const uint16_t A[64][64])
     }
 
     int rank = 0;
-    bool row_selected[64] = {};
+    bool row_selected[64] = {0};
 
     for (int i = 0; i < 64; ++i) {
         int j;
@@ -121,12 +119,12 @@ void generate_matrix(uint16_t matrix[64][64], struct xoshiro_state *state) {
 
 void heavyhash(const uint16_t matrix[64][64], uint8_t* pdata, size_t pdata_len, uint8_t* output)
 {
-    uint8_t hash_first[32] __attribute__((aligned(64)));
-    uint8_t hash_second[32] __attribute__((aligned(64)));
-    uint8_t hash_xored[32] __attribute__((aligned(64)));
+    uint8_t hash_first[32];
+    uint8_t hash_second[32];
+    uint8_t hash_xored[32];
 
-    uint16_t vector[64] __attribute__((aligned(64)));
-    uint16_t product[64] __attribute__((aligned(64)));
+    uint16_t vector[64];
+    uint16_t product[64];
 
     kt_sha3_256((uint8_t*) hash_first, 32, pdata, pdata_len);
 

heavyhash/keccak_tiny.c

@@ -44,7 +44,7 @@ static const uint64_t RC[24] = \
   REPEAT5(e; v += s;)
 
 /*** Keccak-f[1600] ***/
-static inline void keccakf(void* state) {
+static void __inline keccakf(void* state) {
     uint64_t* a = (uint64_t*)state;
     uint64_t b[5] = {0};
     uint64_t t = 0;
@@ -86,13 +86,13 @@ static inline void keccakf(void* state) {
 #define FOR(i, ST, L, S) \
   _(for (size_t i = 0; i < L; i += ST) { S; })
 #define mkapply_ds(NAME, S)                                          \
-  static inline void NAME(uint8_t* dst,                              \
+	static void __inline  NAME(uint8_t* dst, \
                           const uint8_t* src,                        \
                           size_t len) {                              \
     FOR(i, 1, len, S);                                               \
   }
 #define mkapply_sd(NAME, S)                                          \
-  static inline void NAME(const uint8_t* src,                        \
+	static void __inline  NAME(const uint8_t* src, \
                           uint8_t* dst,                              \
                           size_t len) {                              \
     FOR(i, 1, len, S);                                               \
@@ -114,7 +114,7 @@ mkapply_sd(setout, dst[i] = src[i])  // setout
   }
 
 /** The sponge-based hash construction. **/
-static inline int hash(uint8_t* out, size_t outlen,
+static int __inline  hash(uint8_t* out, size_t outlen,
                        const uint8_t* in, size_t inlen,
                        size_t rate, uint8_t delim) {
     if ((out == NULL) || ((in == NULL) && inlen != 0) || (rate >= Plen)) {