Merge pull request #4053 from xmcclure/babysitter_cygwin

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

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index 1f555ed4e324daf757f982df42c12e13733d4ac2..25ed47e011220ca46d82ed85978430066536ca20 100644 (file)
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -315,6 +315,7 @@ struct _MonoDomain {
        MonoObject         *ephemeron_tombstone;
        /* new MonoType [0] */
        MonoArray          *empty_types;
+       MonoString         *empty_string;
        /* 
         * The fields between FIRST_GC_TRACKED and LAST_GC_TRACKED are roots, but
         * not object references.
@@ -339,7 +340,6 @@ struct _MonoDomain {
        /* Needed by Thread:GetDomainID() */
        gint32             domain_id;
        gint32             shadow_serial;
-       unsigned char      inet_family_hint; // used in socket-io.c as a cache
        GSList             *domain_assemblies;
        MonoAssembly       *entry_assembly;
        char               *friendly_name;
@@ -386,10 +386,6 @@ struct _MonoDomain {
 
        /* Information maintained by the JIT engine */
        gpointer runtime_info;
-
-       /*thread pool jobs, used to coordinate shutdown.*/
-       volatile int                    threadpool_jobs;
-       gpointer                                cleanup_semaphore;
        
        /* Contains the compiled runtime invoke wrapper used by finalizers */
        gpointer            finalize_runtime_invoke;
@@ -698,7 +694,7 @@ void
 mono_context_init_checked (MonoDomain *domain, MonoError *error);
 
 gboolean
-mono_assembly_get_reference_assembly_attribute (MonoAssembly *assembly, MonoError *error);
+mono_assembly_has_reference_assembly_attribute (MonoAssembly *assembly, MonoError *error);
 
 
 #endif /* __MONO_METADATA_DOMAIN_INTERNALS_H__ */