diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-02-12 23:25:42 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-02-12 23:25:42 +0200 |
| commit | 4e7bcad58fa682a360b3f8386eb0cd8c91577fb3 (patch) | |
| tree | 9064ac540794c6389b95e2881799e5ee2e4a33a1 /src/common | |
| parent | b0e992237ec84d513387b4d35cc179822ee42d73 (diff) | |
| parent | 422ecc98e4a8d0b4bd64e33cffa3d06ca2f16a62 (diff) | |
| download | monzero-core-4e7bcad58fa682a360b3f8386eb0cd8c91577fb3.tar.gz monzero-core-4e7bcad58fa682a360b3f8386eb0cd8c91577fb3.tar.xz monzero-core-4e7bcad58fa682a360b3f8386eb0cd8c91577fb3.zip | |
Merge pull request #1713
422ecc98 Fixup choice of easylogging++ vs libunwind stack trace code (moneromooo-monero)
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/stack_trace.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/stack_trace.cpp b/src/common/stack_trace.cpp index 67065aae7..ef64c20c5 100644 --- a/src/common/stack_trace.cpp +++ b/src/common/stack_trace.cpp @@ -26,7 +26,7 @@ // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ +#if !defined __GNUC__ || defined __MINGW32__ || defined __MINGW64__ || defined __ANDROID__ #define USE_UNWIND #endif |