* grub-core/lib/dtc/libfdt-grub.diff: Remove extraneous uintptr_t

declaration.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-05-16 16:17:05 +02:00
parent 1a53e1dd5c
commit 141430a295
2 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,8 @@
2013-05-16 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/dtc/libfdt-grub.diff: Remove extraneous uintptr_t
declaration.
2013-05-11 Vladimir Serbinenko <phcoder@gmail.com> 2013-05-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/setjmp_test.c: Ignore missing noreturn. * grub-core/tests/setjmp_test.c: Ignore missing noreturn.

View file

@ -17,13 +17,12 @@ diff -purN libfdt.orig/fdt_rw.c libfdt/fdt_rw.c
diff -purN libfdt.orig/libfdt_env.h libfdt/libfdt_env.h diff -purN libfdt.orig/libfdt_env.h libfdt/libfdt_env.h
--- libfdt.orig/libfdt_env.h 2011-05-08 20:45:39.000000000 +0100 --- libfdt.orig/libfdt_env.h 2011-05-08 20:45:39.000000000 +0100
+++ libfdt/libfdt_env.h 2012-10-19 16:13:19.051344173 +0100 +++ libfdt/libfdt_env.h 2012-10-19 16:13:19.051344173 +0100
@@ -7,6 +7,9 @@ @@ -7,6 +7,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
+#pragma GCC diagnostic ignored "-Wcast-align" +#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wsign-compare" +#pragma GCC diagnostic ignored "-Wsign-compare"
+typedef grub_addr_t uintptr_t;
#define _B(n) ((unsigned long long)((uint8_t *)&x)[n]) #define _B(n) ((unsigned long long)((uint8_t *)&x)[n])
static inline uint32_t static inline uint32_t