From 7393311e1dedbba9dc5496ef2ead7df2f589bcc3 Mon Sep 17 00:00:00 2001 From: Tak Date: Fri, 13 May 2011 15:45:54 +0200 Subject: [PATCH] Don't ifdef ftnptrs_hash. --- mono/metadata/domain-internals.h | 2 -- mono/metadata/domain.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h index 0ad401dd375..603646a5a0b 100644 --- a/mono/metadata/domain-internals.h +++ b/mono/metadata/domain-internals.h @@ -345,9 +345,7 @@ struct _MonoDomain { /* Cache function pointers for architectures */ /* that require wrappers */ -#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) GHashTable *ftnptrs_hash; -#endif }; typedef struct { diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c index 8fa1b02fd25..978d42169d6 100644 --- a/mono/metadata/domain.c +++ b/mono/metadata/domain.c @@ -1243,9 +1243,7 @@ mono_init_internal (const char *filename, const char *exe_filename, const char * /* Avoid system error message boxes. */ SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); #endif -#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) domain->ftnptrs_hash = g_hash_table_new (mono_aligned_addr_hash, NULL); -#endif mono_perfcounters_init (); @@ -2049,12 +2047,10 @@ mono_domain_free (MonoDomain *domain, gboolean force) g_hash_table_destroy (domain->generic_virtual_thunks); domain->generic_virtual_thunks = NULL; } -#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__) if (domain->ftnptrs_hash) { g_hash_table_destroy (domain->ftnptrs_hash); domain->ftnptrs_hash = NULL; } -#endif DeleteCriticalSection (&domain->finalizable_objects_hash_lock); DeleteCriticalSection (&domain->assemblies_lock); -- GitLab