projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged revisions 7797-7917 via svnmerge from
[cacao.git]
/
src
/
vmcore
/
class.c
diff --git
a/src/vmcore/class.c
b/src/vmcore/class.c
index b734ce17e812d5edd310b7fd039663061bae31ac..cbd0a509bde86878951367cb90ac28ed0d339244 100644
(file)
--- a/
src/vmcore/class.c
+++ b/
src/vmcore/class.c
@@
-22,7
+22,7
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: class.c 7
797 2007-04-23 20:12:39
Z michi $
+ $Id: class.c 7
918 2007-05-20 20:42:18
Z michi $
*/
*/
@@
-40,9
+40,7
@@
#include "mm/memory.h"
#include "mm/memory.h"
-#if defined(ENABLE_THREADS)
-# include "threads/native/lock.h"
-#endif
+#include "threads/lock-common.h"
#include "toolbox/logging.h"
#include "toolbox/logging.h"
@@
-243,9
+241,7
@@
classinfo *class_create_classinfo(utf *classname)
if (classname != utf_not_named_yet)
class_set_packagename(c);
if (classname != utf_not_named_yet)
class_set_packagename(c);
-#if defined(ENABLE_THREADS)
- lock_init_object_lock(&c->object.header);
-#endif
+ LOCK_INIT_OBJECT_LOCK(&c->object.header);
return c;
}
return c;
}
@@
-518,12
+514,16
@@
bool class_load_attributes(classbuffer *cb)
if (!loader_load_attribute_signature(cb, &(c->signature)))
return false;
}
if (!loader_load_attribute_signature(cb, &(c->signature)))
return false;
}
+#if 0
+ /* XXX We can't do a release with that enabled */
+
else if (attribute_name == utf_RuntimeVisibleAnnotations) {
/* RuntimeVisibleAnnotations */
if (!annotation_load_attribute_runtimevisibleannotations(cb))
return false;
}
else if (attribute_name == utf_RuntimeVisibleAnnotations) {
/* RuntimeVisibleAnnotations */
if (!annotation_load_attribute_runtimevisibleannotations(cb))
return false;
}
+#endif
#endif
else {
/* unknown attribute */
#endif
else {
/* unknown attribute */