2006-11-09 Jeroen Dekkers <jeroen@dekkers.cx>

	* include/grub/types.h (__unused): Rename to UNUSED.
	* kern/elf.c (grub_elf32_size): Use UNUSED instead of __unused.
	(grub_elf64_size): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9c808c52c479fb431834b4b8cace02a39dc2dff6..6fed6d4a66e08fee48a888b3a7aab633b7fb489c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-09  Jeroen Dekkers  <jeroen@dekkers.cx>
+
+       * 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  <hollis@penguinppc.org>
 
        * kern/elf.c (grub_elf_file): Call grub_file_seek. Call

diff --git a/include/grub/types.h b/include/grub/types.h
index 3f6c94449b2878b55dbbdc45c9ed591deee9977c..6fa5c95f298ddb1e4eb13bfcb92624a5c7bd4208 100644 (file)
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -23,7 +23,7 @@
 #include <config.h>
 #include <grub/cpu/types.h>
 
-#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 df78dade4360c79c114743e66cb8801ea81dc6a1..ecffadfd34381b60ab278fc450ec265da2a5d479 100644 (file)
--- 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)