package/mmc-utils/0001-fix-mmc-h-includes.patch

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