[winmbf] 01/01: avoid keypresses on error for non-MSCV build

[Fabian Greffrath]

This is an automated email from the git hooks/post-receive script.

fabian-guest pushed a commit to branch master
in repository winmbf.

commit ff57f3f667a1c8c6ed40fce841603c484250e314
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Sat May 16 21:11:19 2015 +0200

    avoid keypresses on error for non-MSCV build
---
 debian/patches/portability-linux.patch | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/patches/portability-linux.patch b/debian/patches/portability-linux.patch
index a763c1e..89f159e 100644
--- a/debian/patches/portability-linux.patch
+++ b/debian/patches/portability-linux.patch
@@ -129,17 +129,15 @@
  
 --- a/Source/i_system.c
 +++ b/Source/i_system.c
-@@ -262,8 +262,8 @@ void I_Quit (void)
+@@ -257,7 +257,7 @@ void I_Quit (void)
+       G_CheckDemoStatus();
+    M_SaveDefaults();
+ 
+-#if defined(MY_SDL_VER)
++#if defined(MY_SDL_VER) && defined(_MSC_VER)
+    // Under Visual C++, the console window likes to rudely slam
     // shut -- this can stop it
     if(*errmsg || waitAtExit)
-    {
--      puts("Press any key to continue");
--      getch();
-+      puts("Press Enter to continue");
-+      getchar();
-    }
- #endif
- }
 --- a/Source/m_fixed.h
 +++ b/Source/m_fixed.h
 @@ -36,6 +36,7 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/winmbf.git