提交 7393311e 编写于 作者: T Tak

Don't ifdef ftnptrs_hash.

上级 03b6e7c0
...@@ -345,9 +345,7 @@ struct _MonoDomain { ...@@ -345,9 +345,7 @@ struct _MonoDomain {
/* Cache function pointers for architectures */ /* Cache function pointers for architectures */
/* that require wrappers */ /* that require wrappers */
#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__)
GHashTable *ftnptrs_hash; GHashTable *ftnptrs_hash;
#endif
}; };
typedef struct { typedef struct {
......
...@@ -1243,9 +1243,7 @@ mono_init_internal (const char *filename, const char *exe_filename, const char * ...@@ -1243,9 +1243,7 @@ mono_init_internal (const char *filename, const char *exe_filename, const char *
/* Avoid system error message boxes. */ /* Avoid system error message boxes. */
SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX); SetErrorMode (SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
#endif #endif
#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__)
domain->ftnptrs_hash = g_hash_table_new (mono_aligned_addr_hash, NULL); domain->ftnptrs_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
#endif
mono_perfcounters_init (); mono_perfcounters_init ();
...@@ -2049,12 +2047,10 @@ mono_domain_free (MonoDomain *domain, gboolean force) ...@@ -2049,12 +2047,10 @@ mono_domain_free (MonoDomain *domain, gboolean force)
g_hash_table_destroy (domain->generic_virtual_thunks); g_hash_table_destroy (domain->generic_virtual_thunks);
domain->generic_virtual_thunks = NULL; domain->generic_virtual_thunks = NULL;
} }
#if defined(__ia64__) || defined(__ppc64__) || defined(__powerpc64__)
if (domain->ftnptrs_hash) { if (domain->ftnptrs_hash) {
g_hash_table_destroy (domain->ftnptrs_hash); g_hash_table_destroy (domain->ftnptrs_hash);
domain->ftnptrs_hash = NULL; domain->ftnptrs_hash = NULL;
} }
#endif
DeleteCriticalSection (&domain->finalizable_objects_hash_lock); DeleteCriticalSection (&domain->finalizable_objects_hash_lock);
DeleteCriticalSection (&domain->assemblies_lock); DeleteCriticalSection (&domain->assemblies_lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册