зеркало из https://github.com/mozilla/gecko-dev.git
Bug 694909 - Fix the --enable-gio build to work with ArrayLength changes. r=trivial
--HG-- extra : rebase_source : 3d372a242ab3242d364c613f43fda79120880060
This commit is contained in:
Родитель
64f2d633bf
Коммит
1978a49325
|
@ -267,15 +267,20 @@ nsGSettingsCollection::GetInt(const nsACString& aKey,
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// These types are local to nsGSettingsService::Init, but ISO C++98 doesn't
|
||||||
|
// allow a template (ArrayLength) to be instantiated based on a local type.
|
||||||
|
// Boo-urns!
|
||||||
|
typedef void (*nsGSettingsFunc)();
|
||||||
|
struct nsGSettingsDynamicFunction {
|
||||||
|
const char *functionName;
|
||||||
|
nsGSettingsFunc *function;
|
||||||
|
};
|
||||||
|
|
||||||
nsresult
|
nsresult
|
||||||
nsGSettingsService::Init()
|
nsGSettingsService::Init()
|
||||||
{
|
{
|
||||||
#define FUNC(name, type, params) { #name, (nsGSettingsFunc *)&_##name },
|
#define FUNC(name, type, params) { #name, (nsGSettingsFunc *)&_##name },
|
||||||
typedef void (*nsGSettingsFunc)();
|
static const nsGSettingsDynamicFunction kGSettingsSymbols[] = {
|
||||||
static const struct nsGSettingsDynamicFunction {
|
|
||||||
const char *functionName;
|
|
||||||
nsGSettingsFunc *function;
|
|
||||||
} kGSettingsSymbols[] = {
|
|
||||||
GSETTINGS_FUNCTIONS
|
GSETTINGS_FUNCTIONS
|
||||||
};
|
};
|
||||||
#undef FUNC
|
#undef FUNC
|
||||||
|
|
Загрузка…
Ссылка в новой задаче