Merge pull request #5675 from mono/glib-debug-symbols

[mono.git] / mono / metadata / environment.c

diff --git a/mono/metadata/environment.c b/mono/metadata/environment.c
index 2ccf0fe7217eb1ba5e55bd1524f219565a205cf2..b7001b57ac5664ceae8e509c920c273cc5f83ed6 100644 (file)
--- a/mono/metadata/environment.c
+++ b/mono/metadata/environment.c
@@ -17,10 +17,11 @@
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/environment.h>
 #include <mono/metadata/exception.h>
+#include <mono/metadata/handle.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/w32api.h>
 
-extern MonoString* ves_icall_System_Environment_GetOSVersionString (void);
+extern MonoStringHandle ves_icall_System_Environment_GetOSVersionString (MonoError *error);
 
 #if !defined(HOST_WIN32) && defined(HAVE_SYS_UTSNAME_H)
 #include <sys/utsname.h>
@@ -47,9 +48,10 @@ mono_environment_exitcode_set (gint32 value)
 }
 
 /* note: we better manipulate the string in managed code (easier and safer) */
-MonoString*
-ves_icall_System_Environment_GetOSVersionString (void)
+MonoStringHandle
+ves_icall_System_Environment_GetOSVersionString (MonoError *error)
 {
+       error_init (error);
 #ifdef HOST_WIN32
        OSVERSIONINFOEX verinfo;
 
@@ -63,15 +65,15 @@ ves_icall_System_Environment_GetOSVersionString (void)
                                 verinfo.dwMinorVersion,
                                 verinfo.dwBuildNumber,
                                 verinfo.wServicePackMajor << 16);
-               return mono_string_new (mono_domain_get (), version);
+               return mono_string_new_handle (mono_domain_get (), version, error);
        }
 #elif defined(HAVE_SYS_UTSNAME_H)
        struct utsname name;
 
        if (uname (&name) >= 0) {
-               return mono_string_new (mono_domain_get (), name.release);
+               return mono_string_new_handle (mono_domain_get (), name.release, error);
        }
 #endif
-       return mono_string_new (mono_domain_get (), "0.0.0.0");
+       return mono_string_new_handle (mono_domain_get (), "0.0.0.0", error);
 }