From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 8 Jul 2013 12:46:45 +0000 (+0100)
Subject: Use consistent cpp logic for including backtrace.h
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=8bc25e44c59d6fb2554d39c069d17f79130b3435;p=apitrace

Use consistent cpp logic for including backtrace.h

__linux__ -> __ELF__
---

diff --git a/common/trace_backtrace.cpp b/common/trace_backtrace.cpp
index 5cd30c9..ba2a373 100644
--- a/common/trace_backtrace.cpp
+++ b/common/trace_backtrace.cpp
@@ -112,7 +112,7 @@ bool backtrace_is_needed(const char* fname) {
 
 } /* namespace trace */
 
-#ifdef ANDROID
+#if defined(ANDROID)
 
 #include <dlfcn.h>
 #include "os.hpp"
@@ -270,7 +270,7 @@ std::vector<RawStackFrame> get_backtrace() {
 }
 
 /* end ANDROID */
-#elif defined __linux__
+#elif defined(__ELF__)
 
 #include <stdint.h>
 #include <dlfcn.h>
@@ -278,7 +278,7 @@ std::vector<RawStackFrame> get_backtrace() {
 #include <vector>
 #include <cxxabi.h>
 
-#include "backtrace.h"
+#include <backtrace.h>
 
 namespace trace {