Always use the first version of a class that's loaded twice until the merging code is a bit better tested.

This commit is contained in:
theraven 2011-04-08 09:11:21 +00:00
parent 23b26820f5
commit 95ef5a93f9
2 changed files with 2 additions and 0 deletions

View File

@ -46,6 +46,7 @@ libobjcxx_LDFLAGS = -lstdc++ -lobjc
ifneq ($(enable_legacy), no)
libobjc_C_FILES += legacy_malloc.c
libobjc_CPPFLAGS += -DNO_LEGACY
endif
libobjc_HEADER_FILES_DIR = objc

View File

@ -375,6 +375,7 @@ void objc_load_class(struct objc_class *class)
fprintf(stderr,
"Loading two versions of %s. The class that will be used is undefined\n",
class->name);
return;
}
reload_class(class, existingClass);
return;