diff options
| author | Ian Rogers <irogers@google.com> | 2014-01-31 10:27:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-31 10:27:00 +0000 |
| commit | c98690576ab6d7d13e5c0d3387db8149de71d9de (patch) | |
| tree | b9d77a801ce13a657710aac61fdc274e3e81137c | |
| parent | 84ba6b52b22e91cade601b28dd4c630a1f1d4b70 (diff) | |
| parent | 1ca10eabd84e13e2c71d56ef48218bc981f79497 (diff) | |
| download | system_core-c98690576ab6d7d13e5c0d3387db8149de71d9de.zip system_core-c98690576ab6d7d13e5c0d3387db8149de71d9de.tar.gz system_core-c98690576ab6d7d13e5c0d3387db8149de71d9de.tar.bz2 | |
am 1ca10eab: Merge "Avoid redefinition of __STDC_FORMAT_MACROS."
* commit '1ca10eabd84e13e2c71d56ef48218bc981f79497':
Avoid redefinition of __STDC_FORMAT_MACROS.
| -rw-r--r-- | libbacktrace/BacktraceImpl.cpp | 1 |
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> |