diff --git a/ChangeLog b/ChangeLog index 42c0ff711..439637682 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-10-16 16:53-EDT Gregory John Casamento + + * config/objc-common.g: Correct test. The previous version didn't + include the { and the } in the ivar section. This is not correct. + * Source/ObjectiveC2/sync.m: Correct license text. + 2010-10-13 Richard Frith-Macdonald * Source/NSURL.m: Match OSX behavior with file scheme URLS (treat diff --git a/Source/ObjectiveC2/sync.m b/Source/ObjectiveC2/sync.m index 697a975ea..9a95b5cc7 100644 --- a/Source/ObjectiveC2/sync.m +++ b/Source/ObjectiveC2/sync.m @@ -2,32 +2,24 @@ The implementation of synchronization primitives for Objective-C. Copyright (C) 2008 Free Software Foundation, Inc. - This file is part of GCC. - Gregory Casamento - - GCC is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - GCC is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public - License for more details. - - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING. If not, write to - the Free Software Foundation, 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -/* - As a special exception, if you link this library with files compiled - with GCC to produce an executable, this does not cause the resulting - executable to be covered by the GNU General Public License. This - exception does not however invalidate any other reasons why the - executable file might be covered by the GNU General Public License. + This file is part of the GNUstep Base Library. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02111 USA. */ #include diff --git a/config/objc-common.g b/config/objc-common.g index 4ee3561b4..f35abf07a 100644 --- a/config/objc-common.g +++ b/config/objc-common.g @@ -26,8 +26,10 @@ * for runtime implementations which won't link without them. */ -@interface NSObject +@interface NSObject +{ id isa; +} @end @implementation NSObject @end