[2650] 2009-10-25 Robert Millan <address@hidden>

[Robert Millan]

Revision: 2650
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2650
Author:   robertmh
Date:     2009-10-25 15:14:25 +0000 (Sun, 25 Oct 2009)
Log Message:
-----------
2009-10-25  Robert Millan  <address@hidden>

        * include/grub/misc.h: Fix wrong evaluation of APPLE_CC.
        (memset): Fix function prototype.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/include/grub/misc.h

Property Changed:
----------------
    trunk/grub2/


Property changes on: trunk/grub2
___________________________________________________________________
Modified: bzr:revision-info
   - timestamp: 2009-10-25 01:35:02.167000055 +0200
committer: Robert Millan <address@hidden>
properties: 
        branch-nick: tmp

   + timestamp: 2009-10-25 16:14:08.677999973 +0100
committer: Robert Millan <address@hidden>
properties: 
        branch-nick: fix

Modified: bzr:revision-id:v3-single1-dHJ1bmsvZ3J1YjI.
   - 1769 address@hidden
1770 address@hidden
1771 address@hidden
1772 address@hidden
1773 address@hidden
1774 address@hidden

   + 1769 address@hidden
1770 address@hidden
1771 address@hidden
1772 address@hidden
1773 address@hidden
1774 address@hidden
1775 address@hidden


Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-10-24 23:36:00 UTC (rev 2649)
+++ trunk/grub2/ChangeLog       2009-10-25 15:14:25 UTC (rev 2650)
@@ -1,4 +1,9 @@
 2009-10-25  Robert Millan  <address@hidden>
+
+       * include/grub/misc.h: Fix wrong evaluation of APPLE_CC.
+       (memset): Fix function prototype.
+
+2009-10-25  Robert Millan  <address@hidden>
 2009-10-25  Vasily Averin  <address@hidden>
 
        * fs/ext2.c (grub_ext2_iterate_dir): Avoid infinite loop when

Modified: trunk/grub2/include/grub/misc.h
===================================================================
--- trunk/grub2/include/grub/misc.h     2009-10-24 23:36:00 UTC (rev 2649)
+++ trunk/grub2/include/grub/misc.h     2009-10-25 15:14:25 UTC (rev 2650)
@@ -75,11 +75,11 @@
 }
 
 /* Prototypes for aliases.  */
-#if !defined (GRUB_UTIL) || !defined (APPLE_CC)
+#if !defined (GRUB_UTIL) && !defined (APPLE_CC)
 int EXPORT_FUNC(memcmp) (const void *s1, const void *s2, grub_size_t n);
 void *EXPORT_FUNC(memmove) (void *dest, const void *src, grub_size_t n);
 void *EXPORT_FUNC(memcpy) (void *dest, const void *src, grub_size_t n);
-void EXPORT_FUNC (memset) (void);
+void *EXPORT_FUNC(memset) (void *s, int c, grub_size_t n);
 #endif
 
 int EXPORT_FUNC(grub_memcmp) (const void *s1, const void *s2, grub_size_t n);