Author: zoltan
Date: 2005-04-20 10:44:46 -0400 (Wed, 20 Apr 2005)
New Revision: 43343
Modified:
trunk/mono/mono/metadata/ChangeLog
trunk/mono/mono/metadata/appdomain.c
trunk/mono/mono/metadata/exception.c
trunk/mono/mono/metadata/exception.h
trunk/mono/mono/metadata/marshal.c
trunk/mono/mono/metadata/marshal.h
Log:
2005-04-20 Zoltan Varga <[EMAIL PROTECTED]>
* threads.c marshal.h marshal.c exceptions.h exceptions.c appdomain.c:
Fix some gcc 4.0 warnings.
Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog 2005-04-20 14:35:09 UTC (rev 43342)
+++ trunk/mono/mono/metadata/ChangeLog 2005-04-20 14:44:46 UTC (rev 43343)
@@ -1,4 +1,8 @@
+2005-04-20 Zoltan Varga <[EMAIL PROTECTED]>
+ * threads.c marshal.h marshal.c exceptions.h exceptions.c appdomain.c:
+ Fix some gcc 4.0 warnings.
+
Wed Apr 20 16:09:06 CEST 2005 Paolo Molaro <[EMAIL PROTECTED]>
* file-io.c: fix alt dir separator char on unix systems
Modified: trunk/mono/mono/metadata/appdomain.c
===================================================================
--- trunk/mono/mono/metadata/appdomain.c 2005-04-20 14:35:09 UTC (rev
43342)
+++ trunk/mono/mono/metadata/appdomain.c 2005-04-20 14:44:46 UTC (rev
43343)
@@ -965,7 +965,7 @@
if (*value && strncmp (value, "null", 4)) {
gchar *t = g_strdup (value);
g_strchug (t);
- g_strlcpy (aname->public_key_token, g_strchomp
(value), MONO_PUBLIC_KEY_TOKEN_LENGTH);
+ g_strlcpy ((char*)aname->public_key_token,
g_strchomp (value), MONO_PUBLIC_KEY_TOKEN_LENGTH);
g_free (t);
}
continue;
@@ -1331,7 +1331,7 @@
/* printf ("UNLOAD STARTING FOR %s (%p) IN THREAD 0x%x.\n",
domain->friendly_name, domain, GetCurrentThreadId ()); */
/* Atomically change our state to UNLOADING */
- prev_state = InterlockedCompareExchange (&domain->state,
+ prev_state = InterlockedCompareExchange ((gint32*)&domain->state,
MONO_APPDOMAIN_UNLOADING,
MONO_APPDOMAIN_CREATED);
if (prev_state != MONO_APPDOMAIN_CREATED) {
Modified: trunk/mono/mono/metadata/exception.c
===================================================================
--- trunk/mono/mono/metadata/exception.c 2005-04-20 14:35:09 UTC (rev
43342)
+++ trunk/mono/mono/metadata/exception.c 2005-04-20 14:44:46 UTC (rev
43343)
@@ -143,7 +143,7 @@
*/
MonoException *
mono_exception_from_name_msg (MonoImage *image, const char *name_space,
- const char *name, const guchar *msg)
+ const char *name, const char *msg)
{
MonoException *ex;
@@ -198,14 +198,14 @@
}
MonoException *
-mono_get_exception_execution_engine (const guchar *msg)
+mono_get_exception_execution_engine (const char *msg)
{
return mono_exception_from_name_msg (mono_get_corlib (), "System",
"ExecutionEngineException", msg);
}
MonoException *
-mono_get_exception_serialization (const guchar *msg)
+mono_get_exception_serialization (const char *msg)
{
return mono_exception_from_name_msg (mono_get_corlib (),
"System.Runtime.Serialization",
"SerializationException", msg);
@@ -219,7 +219,7 @@
}
MonoException *
-mono_get_exception_invalid_operation (const guchar *msg)
+mono_get_exception_invalid_operation (const char *msg)
{
return mono_exception_from_name_msg (mono_get_corlib (), "System",
"InvalidOperationException", msg);
@@ -253,7 +253,7 @@
}
MonoException *
-mono_get_exception_not_implemented (const guchar *msg)
+mono_get_exception_not_implemented (const char *msg)
{
MonoException *ex;
@@ -274,7 +274,7 @@
}
MonoException*
-mono_get_exception_argument_null (const guchar *arg)
+mono_get_exception_argument_null (const char *arg)
{
MonoException *ex;
@@ -289,7 +289,7 @@
}
MonoException *
-mono_get_exception_argument (const guchar *arg, const guchar *msg)
+mono_get_exception_argument (const char *arg, const char *msg)
{
MonoException *ex;
@@ -304,7 +304,7 @@
}
MonoException *
-mono_get_exception_argument_out_of_range (const guchar *arg)
+mono_get_exception_argument_out_of_range (const char *arg)
{
MonoException *ex;
@@ -319,14 +319,14 @@
}
MonoException *
-mono_get_exception_thread_state (const guchar *msg)
+mono_get_exception_thread_state (const char *msg)
{
return mono_exception_from_name_msg (
mono_get_corlib (), "System.Threading", "ThreadStateException",
msg);
}
MonoException *
-mono_get_exception_io (const guchar *msg)
+mono_get_exception_io (const char *msg)
{
return mono_exception_from_name_msg (
mono_get_corlib (), "System.IO", "IOException", msg);
@@ -340,7 +340,7 @@
}
MonoException *
-mono_get_exception_file_not_found2 (const guchar *msg, MonoString *fname)
+mono_get_exception_file_not_found2 (const char *msg, MonoString *fname)
{
MonoString *s = mono_string_new (mono_domain_get (), msg);
@@ -382,13 +382,13 @@
}
MonoException *
-mono_get_exception_synchronization_lock (const guchar *msg)
+mono_get_exception_synchronization_lock (const char *msg)
{
return mono_exception_from_name_msg (mono_get_corlib (),
"System.Threading", "SynchronizationLockException", msg);
}
MonoException *
-mono_get_exception_cannot_unload_appdomain (const guchar *msg)
+mono_get_exception_cannot_unload_appdomain (const char *msg)
{
return mono_exception_from_name_msg (mono_get_corlib (), "System",
"CannotUnloadAppDomainException", msg);
}
@@ -400,7 +400,7 @@
}
MonoException *
-mono_get_exception_bad_image_format (const guchar *msg)
+mono_get_exception_bad_image_format (const char *msg)
{
return mono_exception_from_name_msg (mono_get_corlib (), "System",
"BadImageFormatException", msg);
}
Modified: trunk/mono/mono/metadata/exception.h
===================================================================
--- trunk/mono/mono/metadata/exception.h 2005-04-20 14:35:09 UTC (rev
43342)
+++ trunk/mono/mono/metadata/exception.h 2005-04-20 14:44:46 UTC (rev
43343)
@@ -21,7 +21,7 @@
MonoException *
mono_exception_from_name_msg (MonoImage *image, const char
*name_space,
- const char *name, const guchar *msg);
+ const char *name, const char *msg);
extern MonoException *
mono_exception_from_name_domain (MonoDomain *domain, MonoImage *image,
@@ -44,22 +44,22 @@
mono_get_exception_null_reference (void);
MonoException *
-mono_get_exception_execution_engine (const guchar *msg);
+mono_get_exception_execution_engine (const char *msg);
MonoException *
mono_get_exception_thread_abort (void);
MonoException *
-mono_get_exception_thread_state (const guchar *msg);
+mono_get_exception_thread_state (const char *msg);
MonoException *
-mono_get_exception_serialization (const guchar *msg);
+mono_get_exception_serialization (const char *msg);
MonoException *
mono_get_exception_invalid_cast (void);
MonoException *
-mono_get_exception_invalid_operation (const guchar *msg);
+mono_get_exception_invalid_operation (const char *msg);
MonoException *
mono_get_exception_index_out_of_range (void);
@@ -74,40 +74,40 @@
mono_get_exception_missing_method (void);
MonoException *
-mono_get_exception_not_implemented (const guchar *msg);
+mono_get_exception_not_implemented (const char *msg);
MonoException*
-mono_get_exception_argument_null (const guchar *arg);
+mono_get_exception_argument_null (const char *arg);
MonoException *
-mono_get_exception_argument (const guchar *arg, const guchar *msg);
+mono_get_exception_argument (const char *arg, const char *msg);
MonoException *
-mono_get_exception_argument_out_of_range (const guchar *arg);
+mono_get_exception_argument_out_of_range (const char *arg);
MonoException *
-mono_get_exception_io (const guchar *msg);
+mono_get_exception_io (const char *msg);
MonoException *
mono_get_exception_file_not_found (MonoString *fname);
MonoException *
-mono_get_exception_file_not_found2 (const guchar *msg, MonoString
*fname);
+mono_get_exception_file_not_found2 (const char *msg, MonoString *fname);
MonoException *
mono_get_exception_type_initialization (const gchar *type_name, MonoException
*inner);
MonoException *
-mono_get_exception_synchronization_lock (const guchar *msg);
+mono_get_exception_synchronization_lock (const char *msg);
MonoException *
-mono_get_exception_cannot_unload_appdomain (const guchar *msg);
+mono_get_exception_cannot_unload_appdomain (const char *msg);
MonoException *
mono_get_exception_appdomain_unloaded (void);
MonoException *
-mono_get_exception_bad_image_format (const guchar *msg);
+mono_get_exception_bad_image_format (const char *msg);
MonoException *
mono_get_exception_stack_overflow (void);
Modified: trunk/mono/mono/metadata/marshal.c
===================================================================
--- trunk/mono/mono/metadata/marshal.c 2005-04-20 14:35:09 UTC (rev 43342)
+++ trunk/mono/mono/metadata/marshal.c 2005-04-20 14:44:46 UTC (rev 43343)
@@ -7608,7 +7608,8 @@
MonoMarshalType *
mono_marshal_load_type_info (MonoClass* klass)
{
- int j, count = 0, native_size = 0, min_align = 1;
+ int j, count = 0;
+ guint32 native_size = 0, min_align = 1;
MonoMarshalType *info;
MonoClassField* field;
gpointer iter;
@@ -7650,7 +7651,8 @@
iter = NULL;
j = 0;
while ((field = mono_class_get_fields (klass, &iter))) {
- int size, align;
+ int size;
+ guint32 align;
if (field->type->attrs & FIELD_ATTRIBUTE_STATIC)
continue;
@@ -7741,9 +7743,9 @@
* type on the native stack
*/
int
-mono_type_native_stack_size (MonoType *t, gint *align)
+mono_type_native_stack_size (MonoType *t, guint32 *align)
{
- int tmp;
+ guint32 tmp;
g_assert (t != NULL);
@@ -7812,7 +7814,7 @@
#define ALIGNMENT(type) G_STRUCT_OFFSET(struct { char c; type x; }, x)
gint32
-mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, gint32 *align,
+mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, guint32 *align,
gboolean as_field, gboolean unicode)
{
MonoMarshalNative native_type = mono_type_to_unmanaged (type, mspec,
as_field, unicode, NULL);
Modified: trunk/mono/mono/metadata/marshal.h
===================================================================
--- trunk/mono/mono/metadata/marshal.h 2005-04-20 14:35:09 UTC (rev 43342)
+++ trunk/mono/mono/metadata/marshal.h 2005-04-20 14:44:46 UTC (rev 43343)
@@ -32,11 +32,11 @@
mono_marshal_load_type_info (MonoClass* klass);
gint32
-mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, gint32 *align,
+mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, guint32 *align,
gboolean as_field, gboolean unicode);
int
-mono_type_native_stack_size (MonoType *type, int *alignment);
+mono_type_native_stack_size (MonoType *type, guint32 *alignment);
gpointer
mono_array_to_savearray (MonoArray *array);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
