Merge branch 'master' of github.com:beam-mw/beam

Author: Anatol Sevostyan

.travis.yml

@@ -1,16 +1,25 @@
 language: cpp
+
 script:
   - cmake .
   - make
   - make CTEST_OUTPUT_ON_FAILURE=1 test
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-7
-      - cmake-data
-      - cmake
-before_install:
-    - eval "CC=gcc-7 && CXX=g++-7"
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.3beta
+      before_install:
+        - eval "brew update && brew cask uninstall --force oclint && brew install gcc@7 && CC=gcc-7 && CXX=g++-7"
+
+    - os: linux
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-7
+            - cmake-data
+            - cmake
+      before_install:
+        - eval "CC=gcc-7 && CXX=g++-7"

miner/pow/impl/crypto/common.h

@@ -12,7 +12,7 @@
 #include <stdint.h>
 #include <assert.h>
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) || defined(__APPLE__)
 #include "compat/endian.h"
 #endif