[mono/mono] [2 commits] c6994ed5: [runtime] Fix the windows build.

   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/bc55637bd102...0943037e680c

   Commit: c6994ed5fd587f84c849ffda8a8c4a06e9d3f1ed
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-10-23 19:18:36 GMT
      URL: https://github.com/mono/mono/commit/c6994ed5fd587f84c849ffda8a8c4a06e9d3f1ed

[runtime] Fix the windows build.

Changed paths:
  M mono/metadata/threads-types.h

Modified: mono/metadata/threads-types.h
===================================================================
@@ -149,7 +149,7 @@ gpointer mono_create_thread (WapiSecurityAttributes *security,
 void ves_icall_System_Threading_Thread_VolatileWrite4 (void *ptr, gint32) MONO_INTERNAL;
 void ves_icall_System_Threading_Thread_VolatileWrite8 (void *ptr, gint64) MONO_INTERNAL;
 void ves_icall_System_Threading_Thread_VolatileWriteIntPtr (void *ptr, void *) MONO_INTERNAL;
-void ves_icall_System_Threading_Thread_VolatileWriteObject (void *ptr, void *) MONO_INTERNAL;
+void ves_icall_System_Threading_Thread_VolatileWriteObject (void *ptr, MonoObject *) MONO_INTERNAL;
 void ves_icall_System_Threading_Thread_VolatileWriteFloat (void *ptr, float) MONO_INTERNAL;
 void ves_icall_System_Threading_Thread_VolatileWriteDouble (void *ptr, double) MONO_INTERNAL;
 

   Commit: 0943037e680ca15010c2d1fba703aa0259d99067
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-10-23 19:18:45 GMT
      URL: https://github.com/mono/mono/commit/0943037e680ca15010c2d1fba703aa0259d99067

[runtime] Fix a warning.

Changed paths:
  M mono/metadata/locales.c

Modified: mono/metadata/locales.c
===================================================================
@@ -401,7 +401,7 @@ static gint32 string_invariant_indexof_char (MonoString *source, gint32 sindex,
 				}
 
 				CFStringGetBytes (locale_country, CFRangeMake (0, CFStringGetLength (locale_country)), kCFStringEncodingMacRoman, 0, FALSE, (UInt8 *) &darwin_locale[bytes_written], len - bytes_written, &bytes_converted);
-				darwin_locale[bytes_written + bytes_converted] = NULL;
+				darwin_locale[bytes_written + bytes_converted] = '\0';
 			}
 		}
 


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches