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

Tidyups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13879 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-06-14 08:02:53 +00:00
parent b27af8b7a9
commit d1f4c76cd2
4 changed files with 60 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2002-06-14 Richard Frith-Macdonald <rfm@gnu.org>
* config/pathxml.m4: Adjust path to headers.
* Tools/gsdoc.m: Adjust path to headers. Add warning about
deprecation.
* SSL/Makefile.postamble: remove unnecessary instruction
Patch by e.sammer <eric@linuxstep.org>
2002-06-13 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSXML.m: Include NSInvocation.h to avoid

98
Source/NSRunLoop.m
View file

@ -776,17 +776,9 @@ if (0) {
*/
if (pollfds[fdIndex].revents & (POLLPRI|POLLERR|POLLHUP|POLLNVAL))
{
watcher = (GSRunLoopWatcher*)NSMapGet(_efdMap,
(void*)fd);
watcher = (GSRunLoopWatcher*)NSMapGet(_efdMap, (void*)fd);
if (watcher != nil && watcher->_invalidated == NO)
{
/*
* The watcher is still valid - so call its
* receivers event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fd, mode);
i = [contexts count];
while (i-- > 0)
{
@ -794,6 +786,13 @@ if (0) {
if (c != self) [c endEvent: (void*)fd type: ET_EDESC];
}
/*
* The watcher is still valid - so call its
* receivers event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fd, mode);
}
GSNotifyASAP();
if (completed == YES)
@ -804,17 +803,9 @@ if (0) {
}
if (pollfds[fdIndex].revents & (POLLOUT|POLLERR|POLLHUP|POLLNVAL))
{
watcher = (GSRunLoopWatcher*)NSMapGet(_wfdMap,
(void*)fd);
watcher = (GSRunLoopWatcher*)NSMapGet(_wfdMap, (void*)fd);
if (watcher != nil && watcher->_invalidated == NO)
{
/*
* The watcher is still valid - so call its
* receivers event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fd, mode);
i = [contexts count];
while (i-- > 0)
{
@ -822,6 +813,13 @@ if (0) {
if (c != self) [c endEvent: (void*)fd type: ET_WDESC];
}
/*
* The watcher is still valid - so call its
* receivers event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fd, mode);
}
GSNotifyASAP();
if (completed == YES)
@ -832,17 +830,9 @@ if (0) {
}
if (pollfds[fdIndex].revents & (POLLIN|POLLERR|POLLHUP|POLLNVAL))
{
watcher = (GSRunLoopWatcher*)NSMapGet(_rfdMap,
(void*)fd);
watcher = (GSRunLoopWatcher*)NSMapGet(_rfdMap, (void*)fd);
if (watcher != nil && watcher->_invalidated == NO)
{
/*
* The watcher is still valid - so call its
* receivers event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fd, mode);
i = [contexts count];
while (i-- > 0)
{
@ -850,6 +840,13 @@ if (0) {
if (c != self) [c endEvent: (void*)fd type: ET_RDESC];
}
/*
* The watcher is still valid - so call its
* receivers event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fd, mode);
}
GSNotifyASAP();
if (completed == YES)
@ -1087,17 +1084,9 @@ if (0) {
{
GSRunLoopWatcher *watcher;
watcher = (GSRunLoopWatcher*)NSMapGet(_efdMap,
(void*)fdIndex);
watcher = (GSRunLoopWatcher*)NSMapGet(_efdMap, (void*)fdIndex);
if (watcher != nil && watcher->_invalidated == NO)
{
/*
* The watcher is still valid - so call its receivers
* event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fdIndex, mode);
i = [contexts count];
while (i-- > 0)
{
@ -1105,6 +1094,13 @@ if (0) {
if (c != self) [c endEvent: (void*)fdIndex type: ET_EDESC];
}
/*
* The watcher is still valid - so call its receivers
* event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fdIndex, mode);
}
GSNotifyASAP();
if (completed == YES)
@ -1117,16 +1113,9 @@ if (0) {
{
GSRunLoopWatcher *watcher;
watcher = NSMapGet(_wfdMap, (void*)fdIndex);
watcher = (GSRunLoopWatcher*)NSMapGet(_wfdMap, (void*)fdIndex);
if (watcher != nil && watcher->_invalidated == NO)
{
/*
* The watcher is still valid - so call its receivers
* event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fdIndex, mode);
i = [contexts count];
while (i-- > 0)
{
@ -1134,6 +1123,13 @@ if (0) {
if (c != self) [c endEvent: (void*)fdIndex type: ET_WDESC];
}
/*
* The watcher is still valid - so call its receivers
* event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fdIndex, mode);
}
GSNotifyASAP();
if (completed == YES)
@ -1149,13 +1145,6 @@ if (0) {
watcher = (GSRunLoopWatcher*)NSMapGet(_rfdMap, (void*)fdIndex);
if (watcher != nil && watcher->_invalidated == NO)
{
/*
* The watcher is still valid - so call its receivers
* event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fdIndex, mode);
i = [contexts count];
while (i-- > 0)
{
@ -1163,6 +1152,13 @@ if (0) {
if (c != self) [c endEvent: (void*)fdIndex type: ET_RDESC];
}
/*
* The watcher is still valid - so call its receivers
* event handling method.
*/
(*watcher->handleEvent)(watcher->receiver,
eventSel, watcher->data, watcher->type,
(void*)(gsaddr)fdIndex, mode);
}
GSNotifyASAP();
if (completed == YES)

4
Tools/gsdoc.m
View file

@ -89,7 +89,7 @@ Parameters:
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <parser.h>
#include <libxml/parser.h>
NSString *pathExtension_GSDocRefs = @"gsdocrefs";
NSString *pathExtension_GSDoc = @"gsdoc";
@ -4240,6 +4240,8 @@ main(int argc, char **argv, char **env)
#ifdef GS_PASS_ARGUMENTS
[NSProcessInfo initializeWithArguments: argv count: argc environment: env];
#endif
NSLog(@"WARNING ... gsdoc is deprecated. please use autogsdoc instead");
defs = [NSUserDefaults standardUserDefaults];
[defs registerDefaults: [NSDictionary dictionaryWithObjectsAndKeys:
@"Yes", @"Monolithic", nil]];

4
config/pathxml.m4
View file

@ -47,8 +47,8 @@ dnl
AC_TRY_RUN([
#include <stdlib.h>
#include <stdio.h>
#include <xmlversion.h>
#include <parser.h>
#include <libxml/xmlversion.h>
#include <libxml/parser.h>
int
main()