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

main
theraven 15 years ago
parent 23b26820f5
commit 95ef5a93f9

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

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

Loading…
Cancel
Save