summaryrefslogtreecommitdiffstats
path: root/libbacktrace
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-01-31 16:41:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-01-31 16:41:11 +0000
commitf31281406033128373c5c3fc88c8010c4fd9a01a (patch)
treeb9cdeec9bf36bf9c29dbe34971c366f28d85d7a5 /libbacktrace
parent7d6aed2c77ccc1de6716da6fc8db7838f21e4022 (diff)
parentc98690576ab6d7d13e5c0d3387db8149de71d9de (diff)
downloadsystem_core-f31281406033128373c5c3fc88c8010c4fd9a01a.zip
system_core-f31281406033128373c5c3fc88c8010c4fd9a01a.tar.gz
system_core-f31281406033128373c5c3fc88c8010c4fd9a01a.tar.bz2
am c9869057: am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."
* commit 'c98690576ab6d7d13e5c0d3387db8149de71d9de': Avoid redefinition of __STDC_FORMAT_MACROS.
Diffstat (limited to 'libbacktrace')
-rw-r--r--libbacktrace/BacktraceImpl.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/libbacktrace/BacktraceImpl.cpp b/libbacktrace/BacktraceImpl.cpp
index 39296b4..8027d86 100644
--- a/libbacktrace/BacktraceImpl.cpp
+++ b/libbacktrace/BacktraceImpl.cpp
@@ -21,7 +21,6 @@
#include <sys/types.h>
#include <unistd.h>
-#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#include <string>