gnustep/libs-sqlclient
0
0
Fork 0
mirror of https://github.com/gnustep/libs-sqlclient.git synced 2025-02-20 18:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

More apple fixups.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/sqlclient/trunk@21604 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-08-03 05:39:29 +00:00
parent 4da9b3ba28
commit 5c44a76439
3 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-08-03 Richard Frith-Macdonald <rfm@gnu.org>
* GNUmakefile: Add SQLClient_LIBRARIES_DEPEND_UPON for apple as
suggested by Yen-Ju Chen.
* SQLClient.m: Don't call allocation debug functions on apple,
and avoid bogus apple compiler warning.
2005-08-02 Richard Frith-Macdonald <rfm@gnu.org> 2005-08-02 Richard Frith-Macdonald <rfm@gnu.org>
* GNUmakefile: Don't build WebServer stuff on MacOS-X when using the * GNUmakefile: Don't build WebServer stuff on MacOS-X when using the

1
GNUmakefile
View file

@ -31,6 +31,7 @@ endif
ifeq ($(APPLE),1) ifeq ($(APPLE),1)
ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd ADDITIONAL_OBJC_LIBS += -lgnustep-baseadd
SQLClient_LIBRARIES_DEPEND_UPON = -lgnustep-baseadd
else else
SQLClient_OBJC_FILES += WebServer.m WebServerBundles.m SQLClient_OBJC_FILES += WebServer.m WebServerBundles.m
SQLClient_HEADER_FILES += WebServer.h SQLClient_HEADER_FILES += WebServer.h

9
SQLClient.m
View file

@ -134,6 +134,11 @@ inline NSTimeInterval SQLClientTimeNow()
DESTROY(ptr[count + pos]); DESTROY(ptr[count + pos]);
} }
NSDeallocateObject(self); NSDeallocateObject(self);
#ifndef GNUSTEP
// Avoid bogus compiler warning about missing call to super implementation.
self = nil;
[super dealloc];
#endif
} }
- (NSMutableDictionary*) dictionary - (NSMutableDictionary*) dictionary
@ -1316,9 +1321,13 @@ static void quoteString(NSMutableString *s)
if (c != [self class]) if (c != [self class])
{ {
[self disconnect]; [self disconnect];
#ifdef GNUSTEP
GSDebugAllocationRemove(self->isa, self); GSDebugAllocationRemove(self->isa, self);
#endif
self->isa = c; self->isa = c;
#ifdef GNUSTEP
GSDebugAllocationAdd(self->isa, self); GSDebugAllocationAdd(self->isa, self);
#endif
} }
s = [d objectForKey: @"Database"]; s = [d objectForKey: @"Database"];