* 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 9352cde14ca0de3ae6e97254be2e7849482760ad..2f96092f9fc4f7a7171404dc119afa0524b693f3 100644 (file)
--- 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 6b6b6fd153f6349def11eca341d40d6ddad0b8be..c5f94b40654626523198642fae5024057fe88796 100644 (file)
--- 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)));