| commit | e218b31d510091be2a41843aa87643f28de6c5fa | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Thu Mar 06 20:23:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 20:23:36 2014 +0000 |
| tree | 161ba1b40c990b7fca9939e8d5906fbcf432f408 | |
| parent | aa9b2c53b3e1a51133532761b0074d8909599372 [diff] | |
| parent | 1ca10eabd84e13e2c71d56ef48218bc981f79497 [diff] |
am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS." * commit '1ca10eabd84e13e2c71d56ef48218bc981f79497': Avoid redefinition of __STDC_FORMAT_MACROS.
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>