Make code more standards compliant to build with mingw gcc 3.4.0.

Bug #243273 r=bsmedberg sr=dbaron

calendar/libxpical/oeICalStartupHandler.cpp

@@ -1,59 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* Derived from nsICmdLineHandler this file provides the "-calendar" option 
-for launching calendar */
-
-#include "plstr.h"
-#include "nsString.h"
-#include "oeICalStartupHandler.h"
-
-NS_IMPL_ISUPPORTS1(oeICalStartupHandler, nsICmdLineHandler)
-
-oeICalStartupHandler::oeICalStartupHandler()
-{
-}
-
-oeICalStartupHandler::~oeICalStartupHandler()
-{
-}
-
-CMDLINEHANDLER_IMPL(oeICalStartupHandler, "-calendar", "general.startup.calendar",
-                    "chrome://calendar/content", 
-                    "Start with calendar", OE_ICALSTARTUPHANDLER_CONTRACTID,
-                    "Calendar cmd line handler", PR_FALSE, "", PR_TRUE);
-

content/xul/document/src/Makefile.in

@@ -93,7 +93,7 @@ include $(topsrcdir)/config/rules.mk
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
 		  -I$(srcdir)/../../templates/src \
-		  -I$(srcdir)/../../../html/style/src/ \
+		  -I$(srcdir)/../../../html/style/src \
 		  -I$(srcdir)/../../../xml/document/src \
 		  $(NULL)
 

intl/locale/src/windows/nsCollationWin.cpp

@@ -130,7 +130,7 @@ nsresult nsCollationWin::Initialize(nsILocale* locale)
   }
 
   return NS_OK;
-};
+}
 
 
 nsresult nsCollationWin::CompareString(const nsCollationStrength strength,

modules/plugin/base/src/nsPluginNativeWindowWin.cpp

@@ -376,7 +376,7 @@ nsPluginNativeWindowWin::GetPluginWindowEvent(HWND aWnd, UINT aMsg, WPARAM aWPar
   event->Init(aWnd, aMsg, aWParam, aLParam);
   PL_InitEvent(event, (void *)this, &PluginWindowEvent_Handle, PluginWindowEvent_Destroy);
   return event;
-};
+}
 
 nsresult nsPluginNativeWindowWin::CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPluginInstance)
 {

xpcom/io/nsLocalFileWin.cpp

@@ -74,7 +74,7 @@
 extern "C" {
 unsigned char *_mbsstr( const unsigned char *str,
                         const unsigned char *substr );
-};
+}
 #endif
 
 class nsDriveEnumerator : public nsISimpleEnumerator
@@ -2549,7 +2549,7 @@ nsLocalFile::GlobalShutdown()
     NS_DestroyShortcutResolver();
 }
 
-NS_IMPL_ISUPPORTS1(nsDriveEnumerator, nsISimpleEnumerator);
+NS_IMPL_ISUPPORTS1(nsDriveEnumerator, nsISimpleEnumerator)
 
 nsDriveEnumerator::nsDriveEnumerator()
  : mLetter(0)

xpinstall/src/nsWinRegItem.cpp

@@ -37,6 +37,7 @@
 
 #include "nsWinRegItem.h"
 #include "nspr.h"
+#include "nsWinReg.h"
 
 #ifdef WIN32
 #include <windows.h> /* is this needed? */
@@ -264,19 +265,19 @@ nsString* nsWinRegItem::keystr(PRInt32 root, nsString* mSubkey, nsString* mName)
 
 	switch(root)
 	{
-	  case (int)(HKEY_CLASSES_ROOT) :
+	  case nsWinReg::NS_HKEY_CLASSES_ROOT:
 		  rootstr.Assign(NS_LITERAL_STRING("HKEY_CLASSES_ROOT\\"));
 		  break;
 
-	  case (int)(HKEY_CURRENT_USER) :
+	  case nsWinReg::NS_HKEY_CURRENT_USER:
 		  rootstr.Assign(NS_LITERAL_STRING("HKEY_CURRENT_USER\\"));
 		  break;
 
-	  case (int)(HKEY_LOCAL_MACHINE) :
+	  case nsWinReg::NS_HKEY_LOCAL_MACHINE:
 		  rootstr.Assign(NS_LITERAL_STRING("HKEY_LOCAL_MACHINE\\"));
 		  break;
 
-	  case (int)(HKEY_USERS) :
+	  case nsWinReg::NS_HKEY_USERS:
 		  rootstr.Assign(NS_LITERAL_STRING("HKEY_USERS\\"));
 		  break;