From: chrfranke <chrfranke@localhost>
Date: Thu, 11 Jun 2009 21:39:03 +0000 (+0000)
Subject: 2009-06-11  Christian Franke  <franke@computer.org>
X-Git-Tag: 1.98~810
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af1f4f55f8e995b22cb09d772480de6edeef5f92;p=thirdparty%2Fgrub.git

2009-06-11  Christian Franke  <franke@computer.org>

	* kern/misc.c (__enable_execute_stack): Add missing return type
	to prevent gcc warning.
---

diff --git a/ChangeLog b/ChangeLog
index 9809b4f34..5863073b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-11  Christian Franke  <franke@computer.org>
+
+	* kern/misc.c (__enable_execute_stack): Add missing return type
+	to prevent gcc warning.
+
 2009-06-11  Felix Zielcke  <fzielcke@z-51.de>
 
 	* conf/i386-ieee1275.rmk (COMMON_LDFLAGS): Remove `-static -lgcc'.
diff --git a/kern/misc.c b/kern/misc.c
index d8eff6883..d797f1781 100644
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -1106,7 +1106,7 @@ void abort (void) __attribute__ ((alias ("grub_abort")));
 #ifdef NEED_ENABLE_EXECUTE_STACK
 /* Some gcc versions generate a call to this function
    in trampolines for nested functions.  */
-__enable_execute_stack (void *addr __attribute__ ((unused)))
+void __enable_execute_stack (void *addr __attribute__ ((unused)))
 {
 }
 #endif