mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-07 15:37:14 +02:00
Merge pull request #251 from macvim-dev/fix/__bridge
No need to use __bridge for non-ARC
This commit is contained in:
@@ -1689,12 +1689,12 @@ extern GuiFont gui_mch_retain_font(GuiFont font);
|
||||
{
|
||||
MMChannel *mmChannel =
|
||||
[[MMChannel alloc] initWithChannel:channel part:part];
|
||||
return (__bridge void *)mmChannel;
|
||||
return (void *)mmChannel;
|
||||
}
|
||||
|
||||
- (void)removeChannel:(void *)cookie
|
||||
{
|
||||
MMChannel *mmChannel = (__bridge MMChannel *)cookie;
|
||||
MMChannel *mmChannel = (MMChannel *)cookie;
|
||||
[mmChannel release];
|
||||
}
|
||||
|
||||
@@ -3428,7 +3428,7 @@ static void socketReadCallback(CFSocketRef s,
|
||||
const void *data,
|
||||
void *info)
|
||||
{
|
||||
MMChannel *mmChannel = (__bridge MMChannel *)info;
|
||||
MMChannel *mmChannel = (MMChannel *)info;
|
||||
[mmChannel read];
|
||||
}
|
||||
|
||||
@@ -3441,7 +3441,7 @@ static void socketReadCallback(CFSocketRef s,
|
||||
part = p;
|
||||
|
||||
// Tell CFRunLoop that we are interested in channel socket input.
|
||||
CFSocketContext ctx = {0, (__bridge void *)self, NULL, NULL, NULL};
|
||||
CFSocketContext ctx = {0, (void *)self, NULL, NULL, NULL};
|
||||
socket = CFSocketCreateWithNative(kCFAllocatorDefault,
|
||||
channel->ch_part[part].ch_fd,
|
||||
kCFSocketReadCallBack,
|
||||
|
||||
Reference in New Issue
Block a user