From dbc8272acf0f9e2d3496c897adc2874732c66c0c Mon Sep 17 00:00:00 2001
From: John Sully <john@csquare.ca>
Date: Tue, 18 Jun 2019 00:06:42 -0400
Subject: [PATCH] Fix libcxxabi clang compile failure in travis, as well as
 bool issue due to old clang

Former-commit-id: 79e5160e376cfedc690d351d49c3327d5f48c580
---
 .travis.yml | 3 ++-
 src/ae.cpp  | 4 ++--
 src/ae.h    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64c040b38..8d20ca462 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,11 @@ matrix:
             - ubuntu-toolchain-r-test
     - os: linux
       script: make MALLOC=libc
-      env: COMPILER_NAME=clang CXX=clang++-3.8 CC=clang-3.8 CXXFLAGS="-stdlib=libc++" LDFLAGS="-stdlib=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
diff --git a/src/ae.cpp b/src/ae.cpp
index a78c4a7c2..3f1ec9260 100644
--- a/src/ae.cpp
+++ b/src/ae.cpp
@@ -803,9 +803,9 @@ void aeAcquireLock()
     g_lock.lock();
 }
 
-int aeTryAcquireLock(bool fWeak)
+int aeTryAcquireLock(int fWeak)
 {
-    return g_lock.try_lock(fWeak);
+    return g_lock.try_lock(!!fWeak);
 }
 
 void aeReleaseLock()
diff --git a/src/ae.h b/src/ae.h
index 6fd230da9..14ccc3dc8 100644
--- a/src/ae.h
+++ b/src/ae.h
@@ -159,7 +159,7 @@ int aeGetSetSize(aeEventLoop *eventLoop);
 int aeResizeSetSize(aeEventLoop *eventLoop, int setsize);
 
 void aeAcquireLock();
-int aeTryAcquireLock(bool fWeak);
+int aeTryAcquireLock(int fWeak);
 void aeReleaseLock();
 int aeThreadOwnsLock();