0001-mmc-utils-Fix-64-bit-values-redefinition.patch 1.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. mmc-utils: Fix 64-bit values redefinition
  2. Some toolchains include asm-generic/int-l64.h from their asm/types.h
  3. file for certain 64-bit architectures. This causes a conflict between
  4. types like this one:
  5. asm-generic/int-l64.h:28:25: error: conflicting types for '__s64'
  6. typedef __signed__ long __s64;
  7. ^
  8. In file included from mmc.h:17:0,
  9. from mmc_cmds.c:30:
  10. asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was
  11. here
  12. __extension__ typedef __signed__ long long __s64;
  13. Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  14. ---
  15. mmc.h | 4 +++-
  16. 1 files changed, 3 insertions(+), 1 deletions(-)
  17. diff --git a/mmc.h b/mmc.h
  18. index 9871d62..2d54ec5 100644
  19. --- a/mmc.h
  20. +++ b/mmc.h
  21. @@ -14,9 +14,11 @@
  22. * Boston, MA 021110-1307, USA.
  23. */
  24. -#include <asm-generic/int-ll64.h>
  25. #include <linux/mmc/ioctl.h>
  26. #include <stdio.h>
  27. +#ifndef _ASM_GENERIC_INT_L64_H
  28. +#include <asm-generic/int-ll64.h>
  29. +#endif
  30. #define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } }
  31. --
  32. 1.7.1