Merge branch 'master' into next

.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

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");
 		}

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);