Fixing Windows compilation. · 5ce49ee344 - hush3 - DragonX Git

DragonX/hush3

Fixing Windows compilation.

Removing __cpuid definition when compiling for Windows to avoid conflicting definitions of __cpuid provided by gcc and intrin.h .
Updating GitLab yml to deploy to Slack during the build step for manual testing.

This commit is contained in:

Asher Dawes

2018-09-20 16:08:25 -07:00

parent 09dfacd0eb

commit 5ce49ee344

3 changed files with 46 additions and 46 deletions

									
										4

src/script/sigcache.cpp
									
												View File
												
				@@ -9,7 +9,9 @@

				#include "random.h"

				#include "uint256.h"

				#include "util.h"

				#ifdef _WIN32

				#undef __cpuid

				#endif

				#include <boost/thread.hpp>

				#include <boost/tuple/tuple_comparison.hpp>