diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-30 11:10:46 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-06-02 15:57:50 -0700 |
| commit | 5bed8036644f552210a7cfcbed2d6d20cf2981b0 (patch) | |
| tree | 37f784e181086e99b17e00d46b6da30529751539 /libutils/FileMap.cpp | |
| parent | bf0f25905b12581f05b65b1ebe95211c727ae483 (diff) | |
| download | system_core-5bed8036644f552210a7cfcbed2d6d20cf2981b0.tar.gz system_core-5bed8036644f552210a7cfcbed2d6d20cf2981b0.tar.bz2 system_core-5bed8036644f552210a7cfcbed2d6d20cf2981b0.zip | |
libutils: turn on -Werror
- Deal with some -Wunused issues
- Override PRI macros (windows)
- Revert use of PRI macros on off64_t (linux)
- Deal with a gnu++11 complaince issue
Change-Id: Ie66751293bd84477a5a6dfd8a57e700a16e36964
Diffstat (limited to 'libutils/FileMap.cpp')
| -rw-r--r-- | libutils/FileMap.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libutils/FileMap.cpp b/libutils/FileMap.cpp index 933e7aa28..be4b14fed 100644 --- a/libutils/FileMap.cpp +++ b/libutils/FileMap.cpp @@ -23,7 +23,13 @@ #include <utils/FileMap.h> #include <utils/Log.h> +#if defined(HAVE_WIN32_FILEMAP) && !defined(__USE_MINGW_ANSI_STDIO) +# define PRId32 "I32d" +# define PRIx32 "I32x" +# define PRId64 "I64d" +#else #include <inttypes.h> +#endif #include <stdio.h> #include <stdlib.h> @@ -169,8 +175,8 @@ try_again: goto try_again; } - ALOGE("mmap(%" PRId64 ",%zu) failed: %s\n", - adjOffset, adjLength, strerror(errno)); + ALOGE("mmap(%lld,%zu) failed: %s\n", + (long long)adjOffset, adjLength, strerror(errno)); return false; } mBasePtr = ptr; |