gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for 64bit specific bug introduced by gc changes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28069 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2009-03-12 17:40:55 +00:00
parent 10d22d2086
commit 500c32c7be
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2009-03-11 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSMatrix.m: GC fixups ... change code that was attempting
to use the old GSAtomicMallocZone() function.
2009-03-11 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSApplication.m (-setApplicationIconImage:): Copy the new

23
Source/NSMatrix.m
View file

@ -391,7 +391,11 @@ static SEL getSel;
[_cells[i][j] release];
}
NSZoneFree(_myZone, _cells[i]);
NSZoneFree(GSAtomicMallocZone(), _selectedCells[i]);
#if GS_WITH_GC
_selectedCells[i] = 0;
#else
NSZoneFree(_myZone, _selectedCells[i]);
#endif
}
NSZoneFree(_myZone, _cells);
NSZoneFree(_myZone, _selectedCells);
@ -778,9 +782,9 @@ static SEL getSel;
{
[_cells[row][i] autorelease];
}
NSZoneFree(_myZone, _selectedCells[row]);
#endif
NSZoneFree(_myZone, _cells[row]);
NSZoneFree(GSAtomicMallocZone(), _selectedCells[row]);
for (i = row + 1; i < _maxRows; i++)
{
_cells[i-1] = _cells[i];
@ -3899,8 +3903,13 @@ static SEL getSel;
for (i = 0; i < oldMaxR; i++)
{
_cells[i] = NSZoneRealloc(_myZone, _cells[i], col * sizeof(id));
_selectedCells[i] = NSZoneRealloc(GSAtomicMallocZone(),
#if GS_WITH_GC
_selectedCells[i] = NSReallocateCollectable(
_selectedCells[i], col * sizeof(BOOL), 0);
#else
_selectedCells[i] = NSZoneRealloc(_myZone,
_selectedCells[i], col * sizeof(BOOL));
#endif
for (j = oldMaxC; j < col; j++)
{
@ -3930,9 +3939,11 @@ static SEL getSel;
for (i = oldMaxR; i < row; i++)
{
_cells[i] = NSZoneMalloc(_myZone, _maxCols * sizeof(id));
_selectedCells[i] = NSZoneMalloc(GSAtomicMallocZone(),
_maxCols * sizeof(BOOL));
#if GS_WITH_GC
_selectedCells[i] = NSAllocateCollectable(_maxCols * sizeof(BOOL), 0);
#else
_selectedCells[i] = NSZoneMalloc(_myZone, _maxCols * sizeof(BOOL));
#endif
if (i == end)
{
for (j = 0; j < _maxCols; j++)