commit 6a693d57687a18f8e032293b71ca98882a78c93d
author Jean-Baptiste Queru <jbq@google.com> Thu Aug 23 08:04:23 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu Aug 23 08:04:24 2012 -0700
tree 7eb86d0f601ad39a17425fc1492ef196b099f9c2
parent 0254d57367432069256b623c6852da8b92626e79
parent 76b6666f2491ea3be24a19cea59f894db6f8e22f

Merge "Fixed warnings in libmtdutils"

minzip/inline_magic.h

diff --git a/minzip/inline_magic.h b/minzip/inline_magic.h
index 8c185e1..59c659f 100644
--- a/minzip/inline_magic.h
+++ b/minzip/inline_magic.h
@@ -18,7 +18,7 @@
 #define MINZIP_INLINE_MAGIC_H_
 
 #ifndef MINZIP_GENERATE_INLINES
-#define INLINE extern __inline__
+#define INLINE extern inline __attribute((__gnu_inline__))
 #else
 #define INLINE
 #endif

tools/ota/check-lost+found.c

diff --git a/tools/ota/check-lost+found.c b/tools/ota/check-lost+found.c
index f856275..da02f46 100644
--- a/tools/ota/check-lost+found.c
+++ b/tools/ota/check-lost+found.c
@@ -44,7 +44,7 @@
  * 2. Write a log entry with the number of files in lost+found directories.
  */
 
-int main(int argc, char **argv) {
+int main(int argc __attribute__((unused)), char **argv __attribute__((unused))) {
     mkdir(kOutputDir, 0755);
     chown(kOutputDir, AID_SYSTEM, AID_SYSTEM);
     FILE *out = fopen(kOutputFile, "a");