From 2c224008654af00d75ad6f69120aba1af3ee1dbd Mon Sep 17 00:00:00 2001 From: rmottola Date: Fri, 4 Jan 2008 15:27:10 +0000 Subject: [PATCH] fixed c99ism git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25859 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 13 ++++++++----- Source/NSKeyValueObserving.m | 3 ++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33fa614e4..36b9b21bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -2007-01-04 Richard Frith-Macdonald +2008-01-04 Riccardo Mottola + * Source/NSKeyValueObserving.m: fixed cc99ism + +2008-01-04 Richard Frith-Macdonald * config/pathtls.m4: New checks for gnu tls * configure.ac: Add checks for gnu tls. @@ -8,7 +11,7 @@ * configure: regenerate Preparatory checks for using gnu tls. -2007-01-04 Richard Frith-Macdonald +2008-01-04 Richard Frith-Macdonald * Source/GSSocketStream.h: derived from GSStream.h * Source/GSSocketStream.m: derived from GSStream.m @@ -19,7 +22,7 @@ * Source/win32/NSStream.m: include GSSocketStream.h Minor restructuring for clarity. -2007-01-04 Richard Frith-Macdonald +2008-01-04 Richard Frith-Macdonald * Headers/Foundation/NSStream.h: Tweak comments. * Source/GSNetwork.h: New file for common networking declarations. @@ -36,12 +39,12 @@ data in transit in the same way as on unix (ie don't close the local end until a read/write actually fails). -2007-01-03 Richard Frith-Macdonald +2008-01-03 Richard Frith-Macdonald * Source/inet_pton.c: Add mswindows implementation of inet_ntop() as well. -2007-01-02 Richard Frith-Macdonald +2008-01-02 Richard Frith-Macdonald * Source/win32/GSFileHandle.m: rename to GSFileHandleWin32.m * Source/win32/NSUserDefaultsWin32.m: rename to NSUserDefaults.m diff --git a/Source/NSKeyValueObserving.m b/Source/NSKeyValueObserving.m index a3d1921e3..9cd876bbd 100644 --- a/Source/NSKeyValueObserving.m +++ b/Source/NSKeyValueObserving.m @@ -765,6 +765,7 @@ replacementForClass(Class c) context: (void*)aContext { NSMapTable *observers; + NSMapTable *observer; [iLock lock]; observers = (NSMapTable*)NSMapGet(paths, (void*)aPath); @@ -781,7 +782,7 @@ replacementForClass(Class c) * FIXME ... should store an object containing context and options. * For simplicity right now, just store context or a dummy value. */ - NSMapTable * observer = NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks, + observer = NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, 3); NSMapInsert(observer, (void *)@"context", aContext); NSMapInsert(observer, (void *)@"options", (void *)options);