Merge pull request #1659 from alexanderkyte/stringbuilder-referencesource

[mono.git] / mono / metadata / object-internals.h

diff --git a/mono/metadata/object-internals.h b/mono/metadata/object-internals.h
index ccbe6d92e4dad1c86565b59910db201a0197dd6a..6041aa1ae648969e0cf4377647a4c3286b5c9a04 100644 (file)
--- a/mono/metadata/object-internals.h
+++ b/mono/metadata/object-internals.h
@@ -87,7 +87,7 @@
                return retval;                                                                            \
        };                              }G_STMT_END
 
-#define mono_string_builder_length(sb) sb->chunkOffset + sb->chunkChars->max_length
+#define mono_string_builder_capacity(sb) sb->chunkOffset + sb->chunkChars->max_length
 #define mono_string_builder_string_length(sb) sb->chunkOffset + sb->chunkLength
 
 /* 
@@ -363,6 +363,7 @@ typedef struct {
        gint32 il_offset;
        gint32 native_offset;
        gint64 method_address;
+       gint32 method_index;
        MonoReflectionMethod *method;
        MonoString *filename;
        gint32 line;
@@ -389,7 +390,7 @@ struct _MonoInternalThread {
        HANDLE      start_notify;
        gpointer stack_ptr;
        gpointer *static_data;
-       gpointer jit_data;
+       gpointer dead_field_remove_me; /* This used to be jit_data, but that was moved to MonoThreadInfo. */
        void *thread_info; /*This is MonoThreadInfo*, but to simplify dependencies, let's make it a void* here. */
        MonoAppContext *current_appcontext;
        MonoException *pending_exception;