Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support building on modern MSYS2 #13

Open
wants to merge 13 commits into
base: gnustep_testplant_branch
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix compilation error. Added cast to (id) for nil when working with G…
…SIArrayItem and GSIArray. This issue wasn't caught by CI since gui was not recompiled after base was altered.
  • Loading branch information
gcasa authored and qmfrederik committed Jan 10, 2024
commit 164b19b31705fec68baa31c1935b65aa44d2a91f
16 changes: 8 additions & 8 deletions Source/NSView.m
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ - (void) dealloc
}
if (GSIArrayItemAtIndex(nKV(tmp), 0).obj == self)
{
GSIArraySetItemAtIndex(nKV(tmp), (GSIArrayItem)nil, 0);
GSIArraySetItemAtIndex(nKV(tmp), (GSIArrayItem)(id)nil, 0);
}
}
}
Expand Down Expand Up @@ -755,7 +755,7 @@ - (void) dealloc
}
if (GSIArrayItemAtIndex(pKV(tmp), 0).obj == self)
{
GSIArraySetItemAtIndex(pKV(tmp), (GSIArrayItem)nil, 0);
GSIArraySetItemAtIndex(pKV(tmp), (GSIArrayItem)(id)nil, 0);
}
}
}
Expand Down Expand Up @@ -3674,13 +3674,13 @@ - (void) setNextKeyView: (NSView *)aView
}
if (GSIArrayItemAtIndex(pKV(tmp), 0).obj == self)
{
GSIArraySetItemAtIndex(pKV(tmp), (GSIArrayItem)nil, 0);
GSIArraySetItemAtIndex(pKV(tmp), (GSIArrayItem)(id)nil, 0);
}
}
/*
* Clear link to the next key view.
*/
GSIArraySetItemAtIndex(nKV(self), (GSIArrayItem)nil, 0);
GSIArraySetItemAtIndex(nKV(self), (GSIArrayItem)(id)nil, 0);
}
}
return;
Expand All @@ -3694,7 +3694,7 @@ - (void) setNextKeyView: (NSView *)aView
*/
_nextKeyView = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GSIArray_t));
GSIArrayInitWithZoneAndCapacity(nKV(self), NSDefaultMallocZone(), 1);
GSIArrayAddItem(nKV(self), (GSIArrayItem)nil);
GSIArrayAddItem(nKV(self), (GSIArrayItem)(id)nil);
}
else
{
Expand All @@ -3714,7 +3714,7 @@ - (void) setNextKeyView: (NSView *)aView
*/
aView->_previousKeyView = NSZoneMalloc(NSDefaultMallocZone(), sizeof(GSIArray_t));
GSIArrayInitWithZoneAndCapacity(pKV(aView), NSDefaultMallocZone(), 1);
GSIArrayAddItem(pKV(aView), (GSIArrayItem)nil);
GSIArrayAddItem(pKV(aView), (GSIArrayItem)(id)nil);
}

/*
Expand All @@ -3737,7 +3737,7 @@ - (void) setNextKeyView: (NSView *)aView
*/
if (GSIArrayItemAtIndex(nKV(tmp), 0).obj == aView)
{
GSIArrayInsertItem(pKV(aView), (GSIArrayItem)nil, 0);
GSIArrayInsertItem(pKV(aView), (GSIArrayItem)(id)nil, 0);
}
}

Expand All @@ -3762,7 +3762,7 @@ - (void) setNextKeyView: (NSView *)aView
}
if (GSIArrayItemAtIndex(pKV(tmp), 0).obj == self)
{
GSIArraySetItemAtIndex(pKV(tmp), (GSIArrayItem)nil, 0);
GSIArraySetItemAtIndex(pKV(tmp), (GSIArrayItem)(id)nil, 0);
}
}

Expand Down