* [Buildroot] [PATCH] mmc-utils: Fix 64-bit values redefinition
@ 2014-01-30 9:59 Vicente Olivert Riera
2014-02-04 9:02 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: Vicente Olivert Riera @ 2014-01-30 9:59 UTC (permalink / raw)
To: buildroot
Some toolchains include asm-generic/int-l64.h from their asm/types.h
file for certain 64-bit architectures. This causes a conflict between
types like this one:
asm-generic/int-l64.h:28:25: error: conflicting types for '__s64'
typedef __signed__ long __s64;
^
In file included from mmc.h:17:0,
from mmc_cmds.c:30:
asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was
here
__extension__ typedef __signed__ long long __s64;
This patch has been submitted upstream.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
...-mmc-utils-Fix-64-bit-values-redefinition.patch | 40 ++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
create mode 100644 package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch
diff --git a/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch b/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch
new file mode 100644
index 0000000..07dc742
--- /dev/null
+++ b/package/mmc-utils/0001-mmc-utils-Fix-64-bit-values-redefinition.patch
@@ -0,0 +1,40 @@
+mmc-utils: Fix 64-bit values redefinition
+
+Some toolchains include asm-generic/int-l64.h from their asm/types.h
+file for certain 64-bit architectures. This causes a conflict between
+types like this one:
+
+asm-generic/int-l64.h:28:25: error: conflicting types for '__s64'
+ typedef __signed__ long __s64;
+ ^
+In file included from mmc.h:17:0,
+ from mmc_cmds.c:30:
+asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was
+here
+ __extension__ typedef __signed__ long long __s64;
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ mmc.h | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/mmc.h b/mmc.h
+index 9871d62..2d54ec5 100644
+--- a/mmc.h
++++ b/mmc.h
+@@ -14,9 +14,11 @@
+ * Boston, MA 021110-1307, USA.
+ */
+
+-#include <asm-generic/int-ll64.h>
+ #include <linux/mmc/ioctl.h>
+ #include <stdio.h>
++#ifndef _ASM_GENERIC_INT_L64_H
++#include <asm-generic/int-ll64.h>
++#endif
+
+ #define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } }
+
+--
+1.7.1
+
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] mmc-utils: Fix 64-bit values redefinition
2014-01-30 9:59 [Buildroot] [PATCH] mmc-utils: Fix 64-bit values redefinition Vicente Olivert Riera
@ 2014-02-04 9:02 ` Peter Korsgaard
2014-02-04 9:27 ` Vicente Olivert Riera
0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2014-02-04 9:02 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> Some toolchains include asm-generic/int-l64.h from their asm/types.h
> file for certain 64-bit architectures. This causes a conflict between
> types like this one:
> asm-generic/int-l64.h:28:25: error: conflicting types for '__s64'
> typedef __signed__ long __s64;
> ^
> In file included from mmc.h:17:0,
> from mmc_cmds.c:30:
> asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was
> here
> __extension__ typedef __signed__ long long __s64;
> This patch has been submitted upstream.
Did you hear back? I see nothing has changed in the git repo for quite
some time.
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] mmc-utils: Fix 64-bit values redefinition
2014-02-04 9:02 ` Peter Korsgaard
@ 2014-02-04 9:27 ` Vicente Olivert Riera
0 siblings, 0 replies; 3+ messages in thread
From: Vicente Olivert Riera @ 2014-02-04 9:27 UTC (permalink / raw)
To: buildroot
On 02/04/2014 09:02 AM, Peter Korsgaard wrote:
>>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
>
> > Some toolchains include asm-generic/int-l64.h from their asm/types.h
> > file for certain 64-bit architectures. This causes a conflict between
> > types like this one:
>
> > asm-generic/int-l64.h:28:25: error: conflicting types for '__s64'
> > typedef __signed__ long __s64;
> > ^
> > In file included from mmc.h:17:0,
> > from mmc_cmds.c:30:
> > asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was
> > here
> > __extension__ typedef __signed__ long long __s64;
>
> > This patch has been submitted upstream.
>
> Did you hear back? I see nothing has changed in the git repo for quite
> some time.
>
> Committed, thanks.
>
No, unfortunately I haven't received any reply from them.
--
Vincent
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-04 9:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-30 9:59 [Buildroot] [PATCH] mmc-utils: Fix 64-bit values redefinition Vicente Olivert Riera
2014-02-04 9:02 ` Peter Korsgaard
2014-02-04 9:27 ` Vicente Olivert Riera
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox