gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

minor fixes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36839 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-07-05 20:31:54 +00:00
parent 64932aad00
commit d65b9254dd
5 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ChangeLog
View file

@ -1,3 +1,13 @@
2013-07-05 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSObject.m: Fix error creating instasnce when using the
objc2 runtime and garbage collection.
* Source/ObjectiveC2/runtime.c: implement class_createInstance()
by calling NSAllocateObject() .. perhaps it should be the other
way round though.
configure.ac: Fix directory order error.
configure: regenerate
2013-07-05 Fred Kiefer <FredKiefer@gmx.de>
* Headers/GNUstepBase/GSTypeEncoding.h
@ -5,11 +15,11 @@
2013-07-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source\GSSocksParser\GSSocksParser.h:
* Source\GSSocksParser\GSSocksParserPrivate.m:
* Source\GSSocksParser\GSSocks4Parser.m:
* Source\GSSocksParser\GSSocks5Parser.m:
More portability fixes ... this tme for mswindows.
* Source/GSSocksParser/GSSocksParser.h:
* Source/GSSocksParser/GSSocksParserPrivate.m:
* Source/GSSocksParser/GSSocks4Parser.m:
* Source/GSSocksParser/GSSocks5Parser.m:
More portability fixes ... this time for mswindows.
2013-07-04 Ibadinov Marat <ibadinov@me.com>

9
Source/NSObject.m
View file

@ -761,11 +761,16 @@ GSAllocateObject (Class aClass, NSUInteger extraBytes, NSZone *zone);
inline id
NSAllocateObject(Class aClass, NSUInteger extraBytes, NSZone *zone)
{
id new;
if (!objc_collecting_enabled())
{
GSAllocateObject(aClass, extraBytes, zone);
new = GSAllocateObject(aClass, extraBytes, zone);
}
else
{
new = class_createInstance(aClass, extraBytes);
}
id new = class_createInstance(aClass, extraBytes);
if (0 == cxx_construct)
{
cxx_construct = sel_registerName(".cxx_construct");

5
Source/ObjectiveC2/runtime.c
View file

@ -358,9 +358,8 @@ class_copyProtocolList(Class cls, unsigned int *outCount)
id
class_createInstance(Class cls, size_t extraBytes)
{
id obj = malloc(cls->instance_size + extraBytes);
obj->isa = cls;
return obj;
extern id NSAllocateObject(Class, uintptr_t, void*);
return NSAllocateObject(cls, extraBytes, 0);
}
Method

10
configure vendored
View file

@ -3385,11 +3385,11 @@ fi
#
# Add standard library and header directories for configure to use to locate
# plain C developer headers/libraries which haver been installed in the
# GNUstep hierarchy.
# plain C developer headers/libraries which have been installed in the
# GNUstep hierarchy. These take precedence
#
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS -I$GNUSTEP_NETWORK_HEADERS -I$GNUSTEP_LOCAL_HEADERS"
LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_LIBRARIES -L$GNUSTEP_NETWORK_LIBRARIES -L$GNUSTEP_LOCAL_LIBRARIES"
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_LOCAL_HEADERS -I$GNUSTEP_NETWORK_HEADERS -I$GNUSTEP_SYSTEM_HEADERS"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LOCAL_LIBRARIES -L$GNUSTEP_NETWORK_LIBRARIES -L$GNUSTEP_SYSTEM_LIBRARIES"
#--------------------------------------------------------------------
# Find the compiler
@ -26029,7 +26029,7 @@ $as_echo "$ICU_LDFLAGS" >&6; }
{ $as_echo "$as_me:$LINENO: checking for libicu (icu-config disabled)..." >&5
$as_echo "$as_me: checking for libicu (icu-config disabled)..." >&6;}
if test "$icu_libdir" != "no"; then
ICU_LDFLAGS="-I$icu_libdir";
ICU_LDFLAGS="-L$icu_libdir";
fi
saved_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS $LIBS $ICU_LDFLAGS -licui18n -licuuc -licudata -lm"

10
configure.ac
View file

@ -1039,11 +1039,11 @@ fi
#
# Add standard library and header directories for configure to use to locate
# plain C developer headers/libraries which haver been installed in the
# GNUstep hierarchy.
# plain C developer headers/libraries which have been installed in the
# GNUstep hierarchy. These take precedence
#
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_SYSTEM_HEADERS -I$GNUSTEP_NETWORK_HEADERS -I$GNUSTEP_LOCAL_HEADERS"
LDFLAGS="$LDFLAGS -L$GNUSTEP_SYSTEM_LIBRARIES -L$GNUSTEP_NETWORK_LIBRARIES -L$GNUSTEP_LOCAL_LIBRARIES"
CPPFLAGS="$CPPFLAGS -I$GNUSTEP_LOCAL_HEADERS -I$GNUSTEP_NETWORK_HEADERS -I$GNUSTEP_SYSTEM_HEADERS"
LDFLAGS="$LDFLAGS -L$GNUSTEP_LOCAL_LIBRARIES -L$GNUSTEP_NETWORK_LIBRARIES -L$GNUSTEP_SYSTEM_LIBRARIES"
#--------------------------------------------------------------------
# Find the compiler
@ -3202,7 +3202,7 @@ if test $enable_icu = yes; then
have_icu=no;
AC_CHECKING([for libicu (icu-config disabled)])
if test "$icu_libdir" != "no"; then
ICU_LDFLAGS="-I$icu_libdir";
ICU_LDFLAGS="-L$icu_libdir";
fi
saved_LDFLAGS="$LDFLAGS";
LDFLAGS="$LDFLAGS $LIBS $ICU_LDFLAGS -licui18n -licuuc -licudata -lm"