bug 829288 - fix warnings under browser/ r=gavin

This commit is contained in:
Trevor Saunders 2013-01-10 07:34:58 -05:00
parent 78c0c89df2
commit 034d79f06b
2 changed files with 6 additions and 5 deletions

View File

@ -7,11 +7,12 @@
#include <urlhist.h>
#include "mozilla/Attributes.h"
#include "nsISimpleEnumerator.h"
#include "nsIWritablePropertyBag2.h"
#include "nsAutoPtr.h"
class nsIEHistoryEnumerator : public nsISimpleEnumerator
class nsIEHistoryEnumerator MOZ_FINAL : public nsISimpleEnumerator
{
public:
NS_DECL_ISUPPORTS

View File

@ -135,9 +135,9 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// The values checked are all default values so the value name is not needed.
typedef struct {
char* keyName;
char* valueData;
char* oldValueData;
const char* keyName;
const char* valueData;
const char* oldValueData;
} SETTING;
#define APP_REG_NAME L"Firefox"
@ -317,7 +317,7 @@ IsWin8OrLater()
osInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
GetVersionExW(&osInfo);
return osInfo.dwMajorVersion > 6 ||
osInfo.dwMajorVersion >= 6 && osInfo.dwMinorVersion >= 2;
(osInfo.dwMajorVersion >= 6 && osInfo.dwMinorVersion >= 2);
}
static bool