From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 23 Sep 2013 09:22:40 +0000 (+0200)
Subject: 	* include/grub/i386/setjmp.h: Remove useless #if MINGW where original
X-Git-Tag: grub-2.02-beta1~834
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dad9fa6bcf78a6d912261159dc4745bd0e119bc5;p=thirdparty%2Fgrub.git

	* include/grub/i386/setjmp.h: Remove useless #if MINGW where original
	difference was likely just gcc version, not anything mingw-related.
---

diff --git a/ChangeLog b/ChangeLog
index 9352cde14..2f96092f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* include/grub/i386/setjmp.h: Remove useless #if MINGW where original
+	difference was likely just gcc version, not anything mingw-related.
+
 2013-09-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Use Winapi on both cygwin and mingw32 to share more code between both.
diff --git a/include/grub/i386/setjmp.h b/include/grub/i386/setjmp.h
index 6b6b6fd15..c5f94b406 100644
--- a/include/grub/i386/setjmp.h
+++ b/include/grub/i386/setjmp.h
@@ -21,12 +21,8 @@
 
 typedef unsigned long grub_jmp_buf[6];
 
-#ifdef __MINGW32__
-int grub_setjmp (grub_jmp_buf env) __attribute__ ((cdecl, regparm (3)));
-#else
 int grub_setjmp (grub_jmp_buf env) __attribute__ ((returns_twice, cdecl,
 						   regparm (3)));
-#endif
 void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn, cdecl,
 							      regparm (3)));