cb59076418
update to 1.99-rc2 and support gcc46 builds. Cleanup specfile. (forwarded request 69842 from jirislaby) OBS-URL: https://build.opensuse.org/request/show/69887 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=13
33 lines
795 B
Diff
33 lines
795 B
Diff
---
|
|
grub-core/lib/libgcrypt-grub/cipher/camellia.c | 3 +--
|
|
grub-core/lib/libgcrypt/cipher/camellia.c | 3 +--
|
|
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
--- a/grub-core/lib/libgcrypt-grub/cipher/camellia.c
|
|
+++ b/grub-core/lib/libgcrypt-grub/cipher/camellia.c
|
|
@@ -29,9 +29,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
|
|
#include "camellia.h"
|
|
+#include "memory.h"
|
|
|
|
-/* u32 must be 32bit word */
|
|
-typedef unsigned int u32;
|
|
typedef unsigned char u8;
|
|
|
|
/* key constants */
|
|
--- a/grub-core/lib/libgcrypt/cipher/camellia.c
|
|
+++ b/grub-core/lib/libgcrypt/cipher/camellia.c
|
|
@@ -26,10 +26,9 @@
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
+#include "memory.h"
|
|
#include "camellia.h"
|
|
|
|
-/* u32 must be 32bit word */
|
|
-typedef unsigned int u32;
|
|
typedef unsigned char u8;
|
|
|
|
/* key constants */
|