Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gcc 4 fixes for Mac OS X. part 2 of landing (last part). Patch by Mark Mentovai. b=294244 r=josh sr=darin a=dbaron

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@174619 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
joshmoz%gmail.com 2005-06-15 03:52:48 +00:00
parent b3c8eed3c3
commit 6902151737
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/browser/components/migration/src/nsSafariProfileMigrator.cpp
View File

@ -425,7 +425,7 @@ nsSafariProfileMigrator::CopyPreferences(PRBool aReplace)
safariPrefsFile->Append(SAFARI_PREFERENCES_FILE_NAME);
CFDictionaryRef safariPrefs;
nsresult rv = GetPListFromFile(safariPrefsFile, (CFDictionaryRef*)&safariPrefs);
nsresult rv = GetPListFromFile(safariPrefsFile, (CFPropertyListRef*)&safariPrefs);
if (NS_FAILED(rv))
return NS_OK;
@ -444,7 +444,7 @@ nsSafariProfileMigrator::CopyPreferences(PRBool aReplace)
case _SPM(INT):
break;
case _SPM(BOOL): {
CFBooleanRef boolValue = ::CFDictionaryGetValue(safariPrefs, transform->keyName);
CFBooleanRef boolValue = (CFBooleanRef) ::CFDictionaryGetValue(safariPrefs, transform->keyName);
transform->boolValue = boolValue == kCFBooleanTrue;
}
break;

3
mozilla/toolkit/profile/src/nsToolkitProfileService.cpp
View File

@ -867,7 +867,8 @@ XRE_GetFileFromPath(const char *aPath, nsILocalFile* *aResult)
return NS_ERROR_INVALID_ARG;
CFURLRef fullPath =
CFURLCreateFromFileSystemRepresentation(NULL, aPath, pathLen, true);
CFURLCreateFromFileSystemRepresentation(NULL, (const UInt8 *) aPath,
pathLen, true);
if (!fullPath)
return NS_ERROR_FAILURE;

4
mozilla/widget/src/mac/nsDragService.cpp
View File

@ -1014,7 +1014,7 @@ char*
nsDragService::LookupMimeMappingsForItem ( DragReference inDragRef, ItemReference inItemRef )
{
char* mapperData = nsnull;
PRInt32 mapperSize = 0;
PRUint32 mapperSize = 0;
ExtractDataFromOS(inDragRef, inItemRef, nsMimeMapperMac::MappingFlavor(), (void**)&mapperData, &mapperSize);
return mapperData;
@ -1050,7 +1050,7 @@ nsDragService::LookupMimeMappingsForItem ( DragReference inDragRef, ItemReferenc
//
nsresult
nsDragService::ExtractDataFromOS ( DragReference inDragRef, ItemReference inItemRef, ResType inFlavor,
void** outBuffer, PRInt32* outBuffSize )
void** outBuffer, PRUint32* outBuffSize )
{
if ( !outBuffer || !outBuffSize || !inFlavor )
return NS_ERROR_FAILURE;

2
mozilla/widget/src/mac/nsDragService.h
View File

@ -89,7 +89,7 @@ private:
OSErr GetDataForFlavor ( nsISupportsArray* inDragItems, DragReference inDragRef, unsigned int inItemIndex,
FlavorType inFlavor, void** outData, unsigned int * outSize ) ;
nsresult ExtractDataFromOS ( DragReference inDragRef, ItemReference inItemRef, ResType inFlavor,
void** outBuffer, PRInt32* outBuffSize ) ;
void** outBuffer, PRUint32* outBuffSize ) ;
// compute a screen rect from the frame associated with the given dom node
PRBool ComputeGlobalRectFromFrame ( nsIDOMNode* aDOMNode, Rect & outScreenRect ) ;

2
mozilla/widget/src/mac/nsLookAndFeel.cpp
View File

@ -546,7 +546,7 @@ NS_IMETHODIMP nsLookAndFeel::GetMetric(const nsMetricID aID, PRInt32 & aMetric)
if (fullKeyboardAccessProperty)
{
PRInt32 fullKeyboardAccessPrefVal;
if (::CFNumberGetValue(fullKeyboardAccessProperty, kCFNumberIntType, &fullKeyboardAccessPrefVal))
if (::CFNumberGetValue((CFNumberRef) fullKeyboardAccessProperty, kCFNumberIntType, &fullKeyboardAccessPrefVal))
{
// the second bit means "Full keyboard access" is on
if (fullKeyboardAccessPrefVal & (1 << 1))