gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid conflict of ivar name with systemcall name

Browse source
This commit is contained in:
rfm 2023-11-30 08:16:02 +00:00
parent 2473c744d1
commit 5c5a62e8d4
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/GSAvahiRunLoopIntegration.h
View file

@ -43,7 +43,7 @@
{ {
NSRunLoop *runLoop; NSRunLoop *runLoop;
NSString *mode; NSString *mode;
AvahiPoll *poll; AvahiPoll *ap;
NSMutableArray *children; NSMutableArray *children;
NSLock *lock; NSLock *lock;
} }

28
Source/GSAvahiRunLoopIntegration.m
View file

@ -398,16 +398,16 @@ GSAvahiTimeoutFree(AvahiTimeout* timeout)
} }
lock = [[NSLock alloc] init]; lock = [[NSLock alloc] init];
[lock setName: @"GSAvahiRunLoopContextLock"]; [lock setName: @"GSAvahiRunLoopContextLock"];
poll = malloc(sizeof(AvahiPoll)); ap = malloc(sizeof(AvahiPoll));
NSAssert(poll, @"Could not allocate avahi polling structure."); NSAssert(ap, @"Could not allocate avahi polling structure.");
poll->userdata = (void*)self; //userInfo ap->userdata = (void*)self; //userInfo
poll->watch_new = GSAvahiWatchNew; //create a new GSAvahiWatcher ap->watch_new = GSAvahiWatchNew; //create a new GSAvahiWatcher
poll->watch_update = GSAvahiWatchUpdate; //update the watcher ap->watch_update = GSAvahiWatchUpdate; //update the watcher
poll->watch_get_events = GSAvahiWatchGetEvents; //retrieve events ap->watch_get_events = GSAvahiWatchGetEvents; //retrieve events
poll->watch_free = GSAvahiWatchFree; //remove watcher from context ap->watch_free = GSAvahiWatchFree; //remove watcher from context
poll->timeout_new = GSAvahiTimeoutNew; //create a new GSAvahiTimer ap->timeout_new = GSAvahiTimeoutNew; //create a new GSAvahiTimer
poll->timeout_update = GSAvahiTimeoutUpdate; //update the timer ap->timeout_update = GSAvahiTimeoutUpdate; //update the timer
poll->timeout_free = GSAvahiTimeoutFree; //remove the timer from context ap->timeout_free = GSAvahiTimeoutFree; //remove the timer from context
//Runloops don't need to be retained; //Runloops don't need to be retained;
runLoop = rl; runLoop = rl;
ASSIGNCOPY(mode,aMode); ASSIGNCOPY(mode,aMode);
@ -434,7 +434,7 @@ GSAvahiTimeoutFree(AvahiTimeout* timeout)
- (const AvahiPoll*) avahiPoll - (const AvahiPoll*) avahiPoll
{ {
return (const AvahiPoll*)poll; return (const AvahiPoll*)ap;
} }
- (GSAvahiTimer*) avahiTimerWithCallback: (AvahiTimeoutCallback)callback - (GSAvahiTimer*) avahiTimerWithCallback: (AvahiTimeoutCallback)callback
@ -539,7 +539,7 @@ GSAvahiTimeoutFree(AvahiTimeout* timeout)
* try to create additional watchers and timers on the runloop, so we should * try to create additional watchers and timers on the runloop, so we should
* clean it up properly: * clean it up properly:
*/ */
poll->userdata = (void*)NULL; ap->userdata = (void*)NULL;
[self removeFromRunLoop: runLoop [self removeFromRunLoop: runLoop
forMode: mode]; forMode: mode];
FOR_IN(GSAvahiWatcher*, child, children) FOR_IN(GSAvahiWatcher*, child, children)
@ -547,8 +547,8 @@ GSAvahiTimeoutFree(AvahiTimeout* timeout)
[child setContext: nil]; [child setContext: nil];
} }
END_FOR_IN(children) END_FOR_IN(children)
free(poll); free(ap);
poll = NULL; ap = NULL;
[children release]; [children release];
[mode release]; [mode release];
[lock release]; [lock release];