summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2013-11-06 17:47:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-06 17:47:16 -0800
commitaca6a4c8afe609439d8f5204cb273b36ac71cc85 (patch)
treed9f8ca87c81fc42ce67542fcf1ba2109cc4f62ea
parentdee1842d2f6861dd4cb2d622992ec2c75f19ab3e (diff)
parent5e860ce246b9235debc6a04325c7c1983c2b277e (diff)
downloadsystem_core-aca6a4c8afe609439d8f5204cb273b36ac71cc85.zip
system_core-aca6a4c8afe609439d8f5204cb273b36ac71cc85.tar.gz
system_core-aca6a4c8afe609439d8f5204cb273b36ac71cc85.tar.bz2
am 5e860ce2: am d6f9be1b: Merge "Fix include files in backtrace.h."
* commit '5e860ce246b9235debc6a04325c7c1983c2b277e': Fix include files in backtrace.h.
-rw-r--r--include/backtrace/backtrace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/backtrace/backtrace.h b/include/backtrace/backtrace.h
index a833982..8a45690 100644
--- a/include/backtrace/backtrace.h
+++ b/include/backtrace/backtrace.h
@@ -17,9 +17,9 @@
#ifndef _BACKTRACE_H
#define _BACKTRACE_H
-#include <sys/types.h>
+#include <stdint.h>
#include <stdbool.h>
-#include <inttypes.h>
+#include <sys/types.h>
__BEGIN_DECLS