pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Win64 fixes up to FireFox 3.6 (tested on Vista/64)

Browse Source 
Fixed a bug in parsing dependentlibs.list when edited and saved in Windows.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1425 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
Joshy
2011-01-05 21:26:06 +00:00
parent e13a240d8d
commit dcd6bf64fd
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/geckoport/nsInit.pas
View File

@ -1260,8 +1260,12 @@ begin
l := NS_StrLen(buffer); l := NS_StrLen(buffer);
if (buffer[0] = '#') or (l=0) then if (buffer[0] = '#') or (l=0) then
Continue; Continue;
if l>0 then
if buffer[l-1] in [#10, #13] then if buffer[l-1] in [#10, #13] then
buffer[l-1]:= #0; buffer[l-1]:= #0;
if l>1 then
if buffer[l-2] in [#10, #13] then
buffer[l-2]:= #0;
NS_StrCopy(buffer2, xpcomdir); NS_StrCopy(buffer2, xpcomdir);
NS_StrLCat(buffer2, DirectorySeparator, MAX_PATH); NS_StrLCat(buffer2, DirectorySeparator, MAX_PATH);
NS_StrLCat(buffer2, buffer, MAX_PATH); NS_StrLCat(buffer2, buffer, MAX_PATH);

13
components/geckoport/nsTypes.pas
View File

@ -56,22 +56,27 @@ type
{$IFNDEF FPC} {$IFNDEF FPC}
size_t = SizeUint; size_t = SizeUint;
{$ENDIF} {$ENDIF}
{$IFDEF CPU64}
PRSize = PtrUInt;
{$ELSE}
PRSize = PRUint32; PRSize = PRUint32;
{$ENDIF}
PRFileDesc = type Pointer; PRFileDesc = type Pointer;
PRLibrary = type Pointer; PRLibrary = type Pointer;
nsCoord = PRInt32;
nsPoint = record nsPoint = record
x, y: Longint; x, y: nsCoord;
end; end;
nsRect = record nsRect = record
left, top, right, bottom: Longint; left, top, right, bottom: nsCoord;
end; end;
nsMargin = record nsMargin = record
left, top, right, bottom: Longint; left, top, right, bottom: nsCoord;
end; end;
TGUIDArray = array[0..16383] of TGUID; TGUIDArray = array[0..16383] of TGUID;