mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-31 11:01:40 +00:00
Make code more standards compliant to build with mingw gcc 3.4.0.
Bug #243273 r=bsmedberg sr=dbaron
This commit is contained in:
parent
5f44b200a9
commit
790477e161
@ -55,5 +55,5 @@ 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);
|
||||
"Calendar cmd line handler", PR_FALSE, "", PR_TRUE)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -130,7 +130,7 @@ nsresult nsCollationWin::Initialize(nsILocale* locale)
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
nsresult nsCollationWin::CompareString(const nsCollationStrength strength,
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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)
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user