From f21c72b889ab0d358f3b66cc5029a342cd66b18a Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Tue, 31 May 2016 21:30:18 -0400
Subject: [PATCH 1/2] debug: always load exchndl.dll

---
 src/sdl/i_main.c     | 2 ++
 src/win32/win_main.c | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/sdl/i_main.c b/src/sdl/i_main.c
index ab7631bc..25fccb9f 100644
--- a/src/sdl/i_main.c
+++ b/src/sdl/i_main.c
@@ -214,12 +214,14 @@ int main(int argc, char **argv)
 #if defined (_WIN32) && !defined (_XBOX)
 #ifndef _WIN32_WCE
 	{
+#if 0 // just load the DLL
 		p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsDebuggerPresent");
 		if ((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
 #ifdef BUGTRAP
 			&& !InitBugTrap()
 #endif
 			)
+#endif
 		{
 			LoadLibraryA("exchndl.dll");
 		}
diff --git a/src/win32/win_main.c b/src/win32/win_main.c
index 9c9a20e7..663eddbd 100644
--- a/src/win32/win_main.c
+++ b/src/win32/win_main.c
@@ -644,13 +644,16 @@ int WINAPI WinMain (HINSTANCE hInstance,
 {
 	int Result = -1;
 
+#if 0
 	// Win95 and NT <4 don't have this, so link at runtime.
 	p_IsDebuggerPresent pfnIsDebuggerPresent = (p_IsDebuggerPresent)GetProcAddress(GetModuleHandleA("kernel32.dll"),"IsDebuggerPresent");
+#endif
 
 	UNREFERENCED_PARAMETER(hPrevInstance);
 	UNREFERENCED_PARAMETER(lpCmdLine);
 	UNREFERENCED_PARAMETER(nCmdShow);
 
+#if 0
 #ifdef BUGTRAP
 	// Try BugTrap first.
 	if((!pfnIsDebuggerPresent || !pfnIsDebuggerPresent()) && InitBugTrap())
@@ -660,6 +663,7 @@ int WINAPI WinMain (HINSTANCE hInstance,
 #endif
 		// Try Dr MinGW's exception handler.
 		if (!pfnIsDebuggerPresent || !pfnIsDebuggerPresent())
+#endif
 			LoadLibraryA("exchndl.dll");
 
 		prevExceptionFilter = SetUnhandledExceptionFilter(RecordExceptionInfo);

From d86dc67218e7d601fd79c1dfbedd6a38b5958c82 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 1 Jun 2016 11:23:30 -0400
Subject: [PATCH 2/2] travis-ci: add back xcode6.2

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e54677ac..0102cc1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -172,7 +172,7 @@ matrix:
 #        - os: osx
 #          osx_image: beta-xcode6.3
 #          #I think xcode.6.3 VM is broken, it does not boot
-#        - os: osx
+        - os: osx
           osx_image: xcode6.4
           #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
         - os: osx