Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 94373: avoid 'PrefChangedCallback' as a function name in global scope, to avoid problems in static build. r=attinasi, sr=blake

Browse Source
This commit is contained in:
sfraser%netscape.com 2001-08-17 01:14:21 +00:00
parent e3cedfb0b4
commit f853c371ca
5 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/src/mac/nsUnicodeMappingUtil.cpp
View File

@ -37,12 +37,13 @@ nsUnicodeMappingUtil *nsUnicodeMappingUtil::gSingleton = nsnull;
static nsIPref* gPref = nsnull;
static int gUnicodeMappingUtilCount = 0;
int PrefChangedCallback( const char* aPrefName, void* instance_data)
int PR_CALLBACK nsUnicodeMappingUtil::PrefChangedCallback( const char* aPrefName, void* instance_data)
{
//printf("PrefChangeCallback \n");
nsUnicodeMappingUtil::GetSingleton()->Reset();
return 0;
}
nsUnicodeMappingUtil::nsUnicodeMappingUtil()
{
Init();
@ -84,7 +85,7 @@ nsUnicodeMappingUtil::~nsUnicodeMappingUtil()
CleanUp();
if(0 == --gUnicodeMappingUtilCount) {
gPref->UnregisterCallback("font.name.", PrefChangedCallback, (void*) nsnull);
gPref->UnregisterCallback("font.name.", nsUnicodeMappingUtil::PrefChangedCallback, (void*) nsnull);
NS_IF_RELEASE(gPref);
}
}
@ -268,8 +269,8 @@ ScriptCode nsUnicodeMappingUtil::MapLangGroupToScriptCode(const char* aLangGroup
}
#define FACESIZE 255 // font name is Str255 in Mac script code
void
PrefEnumCallback(const char* aName, void* aClosure)
void PR_CALLBACK
nsUnicodeMappingUtil::PrefEnumCallback(const char* aName, void* aClosure)
{
nsUnicodeMappingUtil* Self = (nsUnicodeMappingUtil*)aClosure;
@ -345,9 +346,9 @@ void nsUnicodeMappingUtil::InitFromPref()
if (!gPref) {
return;
}
gPref->RegisterCallback("font.name.", PrefChangedCallback, (void*) nsnull);
gPref->RegisterCallback("font.name.", nsUnicodeMappingUtil::PrefChangedCallback, (void*) nsnull);
}
gPref->EnumerateChildren("font.name.", PrefEnumCallback, this);
gPref->EnumerateChildren("font.name.", nsUnicodeMappingUtil::PrefEnumCallback, this);
}
//--------------------------------------------------------------------------

3
gfx/src/mac/nsUnicodeMappingUtil.h
View File

@ -82,6 +82,9 @@ protected:
void InitScriptFontMapping();
void InitFromPref();
static int PR_CALLBACK_DECL PrefChangedCallback( const char* aPrefName, void* instance_data);
static void PR_CALLBACK_DECL PrefEnumCallback(const char* aName, void* aClosure);
private:
PRUint32 mScriptEnabled;
short mScriptFontMapping[smPseudoTotalScripts];

32
layout/base/nsPresContext.cpp
View File

@ -68,8 +68,8 @@ MakeColorPref(const char *colstr)
return colorref;
}
int
PrefChangedCallback(const char* aPrefName, void* instance_data)
int PR_CALLBACK
nsPresContext::PrefChangedCallback(const char* aPrefName, void* instance_data)
{
nsPresContext* presContext = (nsPresContext*)instance_data;
@ -186,13 +186,13 @@ nsPresContext::~nsPresContext()
// Unregister preference callbacks
if (mPrefs) {
mPrefs->UnregisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.underline_anchors", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.anchor_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.visited_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("network.image.imageBehavior", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("image.animation_mode", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("font.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.underline_anchors", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.anchor_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.visited_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("network.image.imageBehavior", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("image.animation_mode", nsPresContext::PrefChangedCallback, (void*)this);
}
#ifdef IBMBIDI
if (mBidiUtils) {
@ -475,13 +475,13 @@ nsPresContext::Init(nsIDeviceContext* aDeviceContext)
mPrefs = do_GetService(NS_PREF_CONTRACTID);
if (mPrefs) {
// Register callbacks so we're notified when the preferences change
mPrefs->RegisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.underline_anchors", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.anchor_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.visited_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("network.image.imageBehavior", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("image.animation_mode", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("font.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.underline_anchors", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.anchor_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.visited_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("network.image.imageBehavior", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("image.animation_mode", nsPresContext::PrefChangedCallback, (void*)this);
// Initialize our state from the user preferences
GetUserPreferences();

32
layout/base/src/nsPresContext.cpp
View File

@ -68,8 +68,8 @@ MakeColorPref(const char *colstr)
return colorref;
}
int
PrefChangedCallback(const char* aPrefName, void* instance_data)
int PR_CALLBACK
nsPresContext::PrefChangedCallback(const char* aPrefName, void* instance_data)
{
nsPresContext* presContext = (nsPresContext*)instance_data;
@ -186,13 +186,13 @@ nsPresContext::~nsPresContext()
// Unregister preference callbacks
if (mPrefs) {
mPrefs->UnregisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.underline_anchors", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.anchor_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.visited_color", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("network.image.imageBehavior", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("image.animation_mode", PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("font.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.display.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.underline_anchors", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.anchor_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("browser.visited_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("network.image.imageBehavior", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->UnregisterCallback("image.animation_mode", nsPresContext::PrefChangedCallback, (void*)this);
}
#ifdef IBMBIDI
if (mBidiUtils) {
@ -475,13 +475,13 @@ nsPresContext::Init(nsIDeviceContext* aDeviceContext)
mPrefs = do_GetService(NS_PREF_CONTRACTID);
if (mPrefs) {
// Register callbacks so we're notified when the preferences change
mPrefs->RegisterCallback("font.", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.underline_anchors", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.anchor_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.visited_color", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("network.image.imageBehavior", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("image.animation_mode", PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("font.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.display.", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.underline_anchors", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.anchor_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("browser.visited_color", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("network.image.imageBehavior", nsPresContext::PrefChangedCallback, (void*)this);
mPrefs->RegisterCallback("image.animation_mode", nsPresContext::PrefChangedCallback, (void*)this);
// Initialize our state from the user preferences
GetUserPreferences();

2
layout/base/src/nsPresContext.h
View File

@ -252,7 +252,7 @@ protected:
void UpdateCharSet(const PRUnichar* aCharSet);
private:
friend int PR_CALLBACK PrefChangedCallback(const char*, void*);
static int PR_CALLBACK_DECL PrefChangedCallback(const char*, void*);
void PreferenceChanged(const char* aPrefName);
};