diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-18 16:34:45 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-06-26 14:56:27 +0000 |
| commit | a5750e0dad9e90f2195ce36f2c4457fa04b2b83e (patch) | |
| tree | cba2a1ae57e4a61fba2fe3a39d6411aa731950ac /media/libstagefright/TimedEventQueue.cpp | |
| parent | ff17990df24913df9267c9c8b938178716298114 (diff) | |
| download | frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.zip frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.tar.gz frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.tar.bz2 | |
libstagefright: 64-bit compile warnings
Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
Diffstat (limited to 'media/libstagefright/TimedEventQueue.cpp')
| -rw-r--r-- | media/libstagefright/TimedEventQueue.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/libstagefright/TimedEventQueue.cpp b/media/libstagefright/TimedEventQueue.cpp index 3d2eb1f..da50c56 100644 --- a/media/libstagefright/TimedEventQueue.cpp +++ b/media/libstagefright/TimedEventQueue.cpp @@ -17,7 +17,11 @@ #undef __STRICT_ANSI__ #define __STDINT_LIMITS #define __STDC_LIMIT_MACROS + +#include <inttypes.h> #include <stdint.h> +#include <sys/prctl.h> +#include <sys/time.h> //#define LOG_NDEBUG 0 #define LOG_TAG "TimedEventQueue" @@ -26,9 +30,6 @@ #include "include/TimedEventQueue.h" -#include <sys/prctl.h> -#include <sys/time.h> - #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/foundation/ALooper.h> #include <binder/IServiceManager.h> @@ -258,7 +259,7 @@ void TimedEventQueue::threadEntry() { static int64_t kMaxTimeoutUs = 10000000ll; // 10 secs bool timeoutCapped = false; if (delay_us > kMaxTimeoutUs) { - ALOGW("delay_us exceeds max timeout: %lld us", delay_us); + ALOGW("delay_us exceeds max timeout: %" PRId64 " us", delay_us); // We'll never block for more than 10 secs, instead // we will split up the full timeout into chunks of |