diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a19e267d3..d812760c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: make - run: + run: | sudo apt-get install uuid-dev libcurl4-openssl-dev make diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 8d20ca462..000000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: generic -os: osx -matrix: - include: - - os: linux - script: make - env: COMPILER_NAME=g++-6 CXX=g++-6 CC=gcc-6 - addons: - apt: - packages: - - g++-6 - - nasm - - uuid-dev - sources: &sources - - llvm-toolchain-precise-3.8 - - ubuntu-toolchain-r-test - - os: linux - script: make MALLOC=libc - env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 CXXFLAGS="-I/usr/include/libcxxabi/" LDFLAGS="-lc++" - addons: - apt: - packages: - - libc++abi-dev - - clang-3.8 - - libc++-dev - - libc++abi-dev - - nasm - - uuid-dev - sources: *sources diff --git a/src/fastlock.cpp b/src/fastlock.cpp index 5fe5c59db..a1cacfecd 100644 --- a/src/fastlock.cpp +++ b/src/fastlock.cpp @@ -27,6 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include "fmacros.h" #include "fastlock.h" #include #include