From 03e58196a8842291b6b580d0fcf4cfcad13af53f Mon Sep 17 00:00:00 2001 From: jeroen Date: Thu, 9 Nov 2006 19:39:51 +0000 Subject: [PATCH] 2006-11-09 Jeroen Dekkers * include/grub/types.h (__unused): Rename to UNUSED. * kern/elf.c (grub_elf32_size): Use UNUSED instead of __unused. (grub_elf64_size): Likewise. --- ChangeLog | 6 ++++++ include/grub/types.h | 2 +- kern/elf.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c808c52c..6fed6d4a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-11-09 Jeroen Dekkers + + * include/grub/types.h (__unused): Rename to UNUSED. + * kern/elf.c (grub_elf32_size): Use UNUSED instead of __unused. + (grub_elf64_size): Likewise. + 2006-11-03 Hollis Blanchard * kern/elf.c (grub_elf_file): Call grub_file_seek. Call diff --git a/include/grub/types.h b/include/grub/types.h index 3f6c94449..6fa5c95f2 100644 --- a/include/grub/types.h +++ b/include/grub/types.h @@ -23,7 +23,7 @@ #include #include -#define __unused __attribute__ ((unused)) +#define UNUSED __attribute__ ((unused)) #ifdef GRUB_UTIL # define GRUB_CPU_SIZEOF_VOID_P SIZEOF_VOID_P diff --git a/kern/elf.c b/kern/elf.c index df78dade4..ecffadfd3 100644 --- a/kern/elf.c +++ b/kern/elf.c @@ -208,7 +208,7 @@ grub_elf32_size (grub_elf_t elf) /* Run through the program headers to calculate the total memory size we * should claim. */ auto int calcsize (grub_elf_t _elf, Elf32_Phdr *phdr, void *_arg); - int calcsize (grub_elf_t __unused _elf, Elf32_Phdr *phdr, void __unused *_arg) + int calcsize (grub_elf_t UNUSED _elf, Elf32_Phdr *phdr, void UNUSED *_arg) { /* Only consider loadable segments. */ if (phdr->p_type != PT_LOAD) @@ -352,7 +352,7 @@ grub_elf64_size (grub_elf_t elf) /* Run through the program headers to calculate the total memory size we * should claim. */ auto int calcsize (grub_elf_t _elf, Elf64_Phdr *phdr, void *_arg); - int calcsize (grub_elf_t __unused _elf, Elf64_Phdr *phdr, void __unused *_arg) + int calcsize (grub_elf_t UNUSED _elf, Elf64_Phdr *phdr, void UNUSED *_arg) { /* Only consider loadable segments. */ if (phdr->p_type != PT_LOAD)