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

Make usage of defines more consistent

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21792 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-10-09 11:32:10 +00:00
parent 5e6e40a43f
commit e2567a7edc
12 changed files with 78 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2005-10-09 Richard Frith-Macdonald <rfm@gnu.org>
* Headers/Additions/GNUstepBase/GSFileHandle.h:
* Headers/Additions/GNUstepBase/GSRunLoopCtxt.h:
* Headers/Foundation/NSPort.h:
* Headers/Foundation/NSRunLoop.h:
* Source/GSFileHandle.m:
* Source/NSData.m:
* Source/NSFileManager.m:
* Source/NSLog.m:
* Source/NSRunLoop.m:
* Source/NSSocketPort.m:
* Source/NSTimeZone.m:
Be consistent in usage of __WIN32__ and __MINGW__
2005-10-09 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSLog.m: We had complaints about the new code to log output

2
Headers/Additions/GNUstepBase/GSFileHandle.h
View file

@ -58,7 +58,7 @@
#if USE_ZLIB
gzFile gzDescriptor;
#endif
#ifdef __MINGW32__
#if defined(__MINGW__)
WSAEVENT event;
#endif
}

4
Headers/Additions/GNUstepBase/GSRunLoopCtxt.h
View file

@ -39,12 +39,12 @@ typedef struct{
GSIArray performers; /** The actions to perform regularly. */
GSIArray timers; /** The timers set for the runloop mode */
GSIArray watchers; /** The inputs set for the runloop mode */
#ifdef __MINGW32__
#if defined(__MINGW__)
id msgTarget; /** Target to raise a win32 message */
SEL msgSelector; /** method of target */
#endif
@private
#ifdef __MINGW32__
#if defined(__MINGW__)
NSMapTable *handleMap;
#else
NSMapTable *_efdMap;

6
Headers/Foundation/NSPort.h
View file

@ -31,7 +31,7 @@
#include <Foundation/NSObject.h>
#include <Foundation/NSMapTable.h>
#ifdef __MINGW__
#if defined(__MINGW__)
#include <winsock2.h>
#include <wininet.h>
#else
@ -193,7 +193,7 @@ typedef SOCKET NSSocketNativeHandle;
gsu16 portNum; /* TCP port in host byte order. */
SOCKET listener;
NSMapTable *handles; /* Handles indexed by socket. */
#ifdef __MINGW32__
#if defined(__MINGW__)
WSAEVENT eventListener;
NSMapTable *events;
#endif
@ -317,7 +317,7 @@ typedef SOCKET NSSocketNativeHandle;
NSRecursiveLock *myLock;
NSMapTable *handles; /* Handles indexed by socket. */
int listener; /* Descriptor to listen on. */
#ifdef __MINGW32__
#if defined(__MINGW__)
WSAEVENT eventListener;
NSMapTable *events;
#endif

2
Headers/Foundation/NSRunLoop.h
View file

@ -199,7 +199,7 @@ typedef enum {
- (void) getFds: (int*)fds count: (int*)count;
@end
#ifdef __MINGW32__
#if defined(__MINGW__)
/**
* Interface that add method to set target for win32 messages.<br />
*/

28
Source/GSFileHandle.m
View file

@ -1243,7 +1243,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
writeOK = YES;
acceptOK = YES;
connectOK = YES;
#ifdef __MINGW32__
#if defined(__MINGW__)
if (isSocket)
{
event = CreateEvent(NULL, NO, NO, NULL);
@ -1530,7 +1530,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
rval = [self write: (char*)ptr+pos length: toWrite];
if (rval < 0)
{
#ifdef __MINGW32__
#if defined(__MINGW__)
if (WSAGetLastError()== WSAEINTR ||
WSAGetLastError()== WSAEWOULDBLOCK)
#else
@ -1926,7 +1926,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
for (i = 0; i < [modes count]; i++)
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: (void*)(gsaddr)event
type: ET_HANDLE
forMode: [modes objectAtIndex: i]
@ -1941,7 +1941,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
}
else
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: (void*)(gsaddr)event
type: ET_HANDLE
forMode: NSDefaultRunLoopMode
@ -1980,7 +1980,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
for (i = 0; i < [modes count]; i++)
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: (void*)(gsaddr)event
type: ET_HANDLE
forMode: [modes objectAtIndex: i]
@ -1995,7 +1995,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
}
else
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: (void*)(gsaddr)event
type: ET_HANDLE
forMode: NSDefaultRunLoopMode
@ -2026,7 +2026,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
for (i = 0; i < [modes count]; i++)
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l addEvent: (void*)(gsaddr)event
type: ET_HANDLE
watcher: self
@ -2042,7 +2042,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
}
else
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l addEvent: (void*)(gsaddr)event
type: ET_HANDLE
watcher: self
@ -2077,7 +2077,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
for (i = 0; i < [modes count]; i++)
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l addEvent: (void*)(gsaddr)event
type: ET_HANDLE
watcher: self
@ -2092,7 +2092,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
}
else
{
#ifdef __MINGW32__
#if defined(__MINGW__)
[l addEvent: (void*)(gsaddr)event
type: ET_HANDLE
watcher: self
@ -2200,7 +2200,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
}
else if (received < 0)
{
#ifdef __MINGW32__
#if defined(__MINGW__)
if (WSAGetLastError() != WSAEINTR
&& WSAGetLastError() != WSAEWOULDBLOCK)
#else
@ -2279,7 +2279,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
length: length-writePos];
if (written <= 0)
{
#ifdef __MINGW32__
#if defined(__MINGW__)
if (written < 0 && WSAGetLastError()!= WSAEINTR
&& WSAGetLastError()!= WSAEWOULDBLOCK)
#else
@ -2311,7 +2311,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
extra: (void*)extra
forMode: (NSString*)mode
{
#ifdef __MINGW32__
#if defined(__MINGW__)
WSANETWORKEVENTS ocurredEvents;
#endif
@ -2321,7 +2321,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
{
[self setNonBlocking: YES];
}
#ifdef __MINGW32__
#if defined(__MINGW__)
if (WSAEnumNetworkEvents((SOCKET)_get_osfhandle(descriptor),
event, &ocurredEvents) == SOCKET_ERROR)
{

2
Source/NSData.m
View file

@ -64,7 +64,7 @@
*
*/
#if defined(__MINGW32__)
#if defined(__MINGW__)
#define UNICODE
#define _UNICODE
#endif

4
Source/NSFileManager.m
View file

@ -38,7 +38,7 @@
#define _FILE_OFFSET_BITS 64
#if defined(__MINGW32__)
#if defined(__MINGW__)
#define UNICODE
#define _UNICODE
#endif
@ -89,7 +89,7 @@
#if defined(_POSIX_VERSION) || defined(__WIN32__)
# include <limits.h> /* for PATH_MAX */
# if defined(__MINGW32__)
# if defined(__MINGW__)
# include <sys/utime.h>
# else
# include <utime.h>

6
Source/NSLog.m
View file

@ -129,7 +129,7 @@ _NSLog_standard_printf_handler (NSString* message)
len = [d length];
}
#if defined(HAVE_SYSLOG) || defined(WIN32)
#if defined(HAVE_SYSLOG) || defined(__WIN32__)
if (GSUserDefaultsFlag(GSLogSyslog) == YES
|| write(_NSLogDescriptor, buf, len) != (int)len)
{
@ -138,7 +138,7 @@ _NSLog_standard_printf_handler (NSString* message)
strncpy (null_terminated_buf, buf, len);
null_terminated_buf[len] = '\0';
#if defined(WIN32)
#if defined(__WIN32__)
OutputDebugString(null_terminated_buf);
if (!IsDebuggerPresent())
{
@ -164,7 +164,7 @@ _NSLog_standard_printf_handler (NSString* message)
}
#else
syslog(SYSLOGMASK, "%s", null_terminated_buf);
#endif // WIN32
#endif // __WIN32__
objc_free (null_terminated_buf);
}

4
Source/NSRunLoop.m
View file

@ -955,7 +955,7 @@ extern IMP wRetImp;
{
when = min_watcher->_date;
}
#ifdef __MINGW32__
#if defined(__MINGW__)
// if there are handler for win32 messages
else if (context->msgTarget != nil)
{
@ -1007,7 +1007,7 @@ extern IMP wRetImp;
if ((context == nil || (watchers = context->watchers) == 0
|| (i = GSIArrayCount(watchers)) == 0)
#ifdef __MINGW32__
#if defined(__MINGW__)
// there are inputs for win32 messages
&& context->msgTarget == 0)
#else

52
Source/NSSocketPort.m
View file

@ -219,7 +219,7 @@ typedef enum {
+ (GSTcpHandle*) handleWithDescriptor: (SOCKET)d;
- (BOOL) connectToPort: (NSSocketPort*)aPort beforeDate: (NSDate*)when;
- (int) descriptor;
#ifdef __MINGW32__
#if defined(__MINGW__)
- (int) eventHandle;
#endif
- (void) invalidate;
@ -415,7 +415,7 @@ static Class runLoopClass;
handle->wMsgs = [NSMutableArray new];
handle->myLock = [GSLazyRecursiveLock new];
handle->valid = YES;
#ifdef __MINGW32__
#if defined(__MINGW__)
ev = (WSAEVENT)CreateEvent(NULL,NO,NO,NULL);
if (ev == WSA_INVALID_EVENT)
{
@ -564,7 +564,7 @@ static Class runLoopClass;
state = GS_H_TRYCON;
l = [NSRunLoop currentRunLoop];
#ifdef __MINGW32__
#if defined(__MINGW__)
NSAssert(event != WSA_INVALID_EVENT, @"Socket without win32 event!");
[l addEvent: (void*)(gsaddr)event
type: ET_HANDLE
@ -590,7 +590,7 @@ static Class runLoopClass;
M_LOCK(myLock);
}
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: (void*)(gsaddr)event
type: ET_HANDLE
forMode: NSConnectionReplyMode
@ -669,7 +669,7 @@ static Class runLoopClass;
return desc;
}
#ifdef __MINGW32__
#if defined(__MINGW__)
- (int) eventHandle
{
return (int)event;
@ -694,7 +694,7 @@ static Class runLoopClass;
valid = NO;
l = [runLoopClass currentRunLoop];
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: (void*)(gsaddr)event
type: ET_HANDLE
forMode: nil
@ -716,7 +716,7 @@ static Class runLoopClass;
NSDebugMLLog(@"GSTcpHandle", @"invalidated 0x%x", self);
[[self recvPort] removeHandle: self];
[[self sendPort] removeHandle: self];
#ifdef __MINGW32__
#if defined(__MINGW__)
WSACloseEvent(event);
event = WSA_INVALID_EVENT;
#endif
@ -1194,7 +1194,7 @@ static Class runLoopClass;
extra: (void*)extra
forMode: (NSString*)mode
{
#ifdef __MINGW32__
#if defined(__MINGW__)
WSANETWORKEVENTS ocurredEvents;
#endif
NSDebugMLLog(@"GSTcpHandle", @"received %s event on 0x%x",
@ -1207,7 +1207,7 @@ static Class runLoopClass;
{
NSRunLoop *l = [runLoopClass currentRunLoop];
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: data
type: ET_HANDLE
forMode: mode
@ -1227,7 +1227,7 @@ static Class runLoopClass;
M_LOCK(myLock);
#ifdef __MINGW32__
#if defined(__MINGW__)
if (WSAEnumNetworkEvents(desc, event, &ocurredEvents)==SOCKET_ERROR)
{
NSLog(@"Error getting event type %d", WSAGetLastError());
@ -1324,7 +1324,7 @@ static Class runLoopClass;
RETAIN(self);
#ifdef __MINGW32__
#if defined(__MINGW__)
NSAssert(event != WSA_INVALID_EVENT, @"Socket without win32 event!");
[l addEvent: (void*)(gsaddr)event
type: ET_HANDLE
@ -1347,7 +1347,7 @@ static Class runLoopClass;
&& [when timeIntervalSinceNow] > 0)
{
M_UNLOCK(myLock);
#ifdef __MINGW32__
#if defined(__MINGW__)
if (readyToSend)
{
[self receivedEventWrite];
@ -1362,7 +1362,7 @@ static Class runLoopClass;
M_LOCK(myLock);
}
#ifdef __MINGW32__
#if defined(__MINGW__)
[l removeEvent: (void*)(gsaddr)event
type: ET_HANDLE
forMode: NSConnectionReplyMode
@ -1548,7 +1548,7 @@ static unsigned wordAlign;
port->address = [addr copy];
port->handles = NSCreateMapTable(NSIntMapKeyCallBacks,
NSObjectMapValueCallBacks, 0);
#ifdef __MINGW32__
#if defined(__MINGW__)
port->eventListener = WSA_INVALID_EVENT;
port->events = NSCreateMapTable(NSIntMapKeyCallBacks,
NSIntMapValueCallBacks, 0);
@ -1644,7 +1644,7 @@ static unsigned wordAlign;
}
else
{
#ifdef __MINGW32__
#if defined(__MINGW__)
int rc;
#endif
/*
@ -1654,7 +1654,7 @@ static unsigned wordAlign;
*/
port->listener = desc;
port->portNum = GSSwapBigI16ToHost(sockaddr.sin_port);
#ifdef __MINGW32__
#if defined(__MINGW__)
port->eventListener = (WSAEVENT)CreateEvent(NULL,NO,NO,NULL);
if (port->eventListener == WSA_INVALID_EVENT)
{
@ -1737,7 +1737,7 @@ static unsigned wordAlign;
handle->recvPort = GS_GC_HIDE(self);
}
NSMapInsert(handles, (void*)(gsaddr)[handle descriptor], (void*)handle);
#ifdef __MINGW32__
#if defined(__MINGW__)
NSMapInsert(events, (void*)(gsaddr)[handle eventHandle],
(void*)(gsaddr)[handle descriptor]);
#endif
@ -1790,7 +1790,7 @@ static unsigned wordAlign;
* This is a callback method used by the NSRunLoop class to determine which
* descriptors to watch for the port.
*/
#ifdef __MINGW32__
#if defined(__MINGW__)
- (void) getFds: (int*)fds count: (int*)count
{
NSMapEnumerator me;
@ -2029,7 +2029,7 @@ static unsigned wordAlign;
{
(void) close(listener);
listener = -1;
#ifdef __MINGW32__
#if defined(__MINGW__)
WSACloseEvent(eventListener);
eventListener = WSA_INVALID_EVENT;
#endif
@ -2058,7 +2058,7 @@ static unsigned wordAlign;
handles = 0;
}
}
#ifdef __MINGW32__
#if defined(__MINGW__)
if (events != 0)
{
NSFreeMapTable(events);
@ -2100,7 +2100,7 @@ static unsigned wordAlign;
extra: (void*)extra
forMode: (NSString*)mode
{
#ifdef __MINGW32__
#if defined(__MINGW__)
WSAEVENT event = (WSAEVENT)extra;
SOCKET desc;
#else
@ -2111,7 +2111,7 @@ static unsigned wordAlign;
NSDebugMLLog(@"NSPort", @"received %s event on 0x%x",
type == ET_RPORT ? "read" : "write", self);
#ifdef __MINGW32__
#if defined(__MINGW__)
if (event == eventListener)
#else
if (desc == listener)
@ -2131,7 +2131,7 @@ static unsigned wordAlign;
setsockopt(desc, SOL_SOCKET, SO_KEEPALIVE, (char*)&status,
sizeof(status));
#ifdef __MINGW32__
#if defined(__MINGW__)
// reset associated event with new socket
WSAEventSelect(desc, eventListener, 0);
#endif
@ -2152,7 +2152,7 @@ static unsigned wordAlign;
else
{
M_LOCK(myLock);
#ifdef __MINGW32__
#if defined(__MINGW__)
desc = (SOCKET)NSMapGet(events, (void*)(gsaddr)event);
#endif
handle = (GSTcpHandle*)NSMapGet(handles, (void*)(gsaddr)desc);
@ -2162,7 +2162,7 @@ static unsigned wordAlign;
{
const char *t;
#ifdef __MINGW32__
#if defined(__MINGW__)
if (type == ET_HANDLE) t = "winhandle";
#else
if (type == ET_RDESC) t = "rdesc";
@ -2212,7 +2212,7 @@ static unsigned wordAlign;
handle->recvPort = nil;
}
NSMapRemove(handles, (void*)(gsaddr)[handle descriptor]);
#ifdef __MINGW32__
#if defined(__MINGW__)
NSMapRemove(events, (void*)(gsaddr)[handle eventHandle]);
#endif
if (((int) listener) < 0 && NSCountMapTable(handles) == 0)

15
Source/NSTimeZone.m
View file

@ -196,7 +196,7 @@ typedef struct {
}
@end
#ifdef WIN32
#if defined(__WIN32__)
@interface GSWindowsTimeZone : NSTimeZone
{
@public
@ -418,8 +418,9 @@ static NSString *_time_zone_path(NSString *subpath, NSString *type)
}
fileName = [NSTimeZoneClass getTimeZoneFile: name];
if (fileName == nil || ![[NSFileManager defaultManager] fileExistsAtPath:fileName])
#ifdef WIN32
if (fileName == nil
|| ![[NSFileManager defaultManager] fileExistsAtPath:fileName])
#if defined(__WIN32__)
{
zone = [[GSWindowsTimeZone alloc] initWithName:name data:0];
RELEASE(self);
@ -433,7 +434,7 @@ static NSString *_time_zone_path(NSString *subpath, NSString *type)
#endif
data = [NSData dataWithContentsOfFile: fileName];
}
#ifdef WIN32
#if defined(__WIN32__)
if (!data)
zone = [[GSWindowsTimeZone alloc] initWithName: name data: data];
else
@ -1251,7 +1252,7 @@ static NSMapTable *absolutes = 0;
}
#endif
#ifdef WIN32
#if defined(__WIN32__)
/*
* Try to get timezone from windows registry.
*/
@ -1687,7 +1688,7 @@ static NSMapTable *absolutes = 0;
@end
#ifdef WIN32
#if defined(__WIN32__)
/* Timezone information data as stored in the registry */
typedef struct TZI_format {
LONG Bias;
@ -2060,7 +2061,7 @@ int dayOfCommonEra(NSTimeInterval when);
return timeZoneName;
}
@end
#endif // WIN32
#endif // __WIN32__
@implementation GSTimeZone