From 95ef5a93f9228858a591661249988ddcc9ed065b Mon Sep 17 00:00:00 2001
From: theraven <theraven@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 8 Apr 2011 09:11:21 +0000
Subject: [PATCH] Always use the first version of a class that's loaded twice
 until the merging code is a bit better tested.

---
 GNUmakefile   | 1 +
 class_table.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/GNUmakefile b/GNUmakefile
index 9db86f6..541dcff 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -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
diff --git a/class_table.c b/class_table.c
index 7952e26..7d00582 100644
--- a/class_table.c
+++ b/class_table.c
@@ -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;