From dc9d8b1a54ac125ac70def368c656a7a7ab83259 Mon Sep 17 00:00:00 2001
From: "bryner%brianryner.com"
 <bryner%brianryner.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 1 Oct 2003 01:17:56 +0000
Subject: [PATCH] patch from will levine to fix building with mingw gcc 3.3.1
 (bug 220433).

git-svn-id: svn://10.0.0.236/trunk@147473 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/app/nsBrowserApp.cpp | 2 +-
 mozilla/browser/app/splash.rc        | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mozilla/browser/app/nsBrowserApp.cpp b/mozilla/browser/app/nsBrowserApp.cpp
index 8edf8d8b935..383d12d19a5 100644
--- a/mozilla/browser/app/nsBrowserApp.cpp
+++ b/mozilla/browser/app/nsBrowserApp.cpp
@@ -55,7 +55,7 @@ int main(int argc, char* argv[])
 char* splash_xpm[] = {0};
 #endif
 
-#ifdef XP_WIN
+#if defined( XP_WIN ) && defined( WIN32 ) && !defined(__GNUC__)
 // We need WinMain in order to not be a console app.  This function is
 // unused if we are a console application.
 int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR args, int )
diff --git a/mozilla/browser/app/splash.rc b/mozilla/browser/app/splash.rc
index fe816d528d4..6623bf3aa03 100644
--- a/mozilla/browser/app/splash.rc
+++ b/mozilla/browser/app/splash.rc
@@ -54,9 +54,7 @@ IDD_SPLASH DIALOGEX
 	FONT 8, "MS Sans Serif"
 	BEGIN
 		CONTROL
-#ifndef __MINGW32__
-            IDB_SPLASH,
-#endif
+            		IDB_SPLASH,
 			IDB_SPLASH,
 			"Static",
 			SS_BITMAP,