Merge remote-tracking branch 'origin/master' into tizen

diff --git a/src/Tizen.System.Information/Interop/Interop.Libc.cs b/src/Tizen.System.Information/Interop/Interop.Libc.cs
deleted file mode 100755 (executable)
index ef021f1..0000000
--- a/src/Tizen.System.Information/Interop/Interop.Libc.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.0 (the License);
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an AS IS BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-using System;
-using System.Runtime.InteropServices;
-
-internal static partial class Interop
-{
-    internal static partial class Libc
-    {
-        [DllImport(Libraries.Libc, EntryPoint = "free")]
-        public static extern void Free(IntPtr ptr);
-    }
-}

diff --git a/src/Tizen.System.Information/Interop/Interop.Libraries.cs b/src/Tizen.System.Information/Interop/Interop.Libraries.cs
index 60ae721..ddb1884 100755 (executable)
--- a/src/Tizen.System.Information/Interop/Interop.Libraries.cs
+++ b/src/Tizen.System.Information/Interop/Interop.Libraries.cs
@@ -20,6 +20,5 @@ internal static partial class Interop
     {
         internal const string RuntimeInfo = "libcapi-system-runtime-info.so.0";
         internal const string SystemInfo = "libcapi-system-info.so.0";
-        internal const string Libc = "libc.so.6";
     }
 }

diff --git a/src/Tizen.System.Information/Usage/ProcessMemoryUsage.cs b/src/Tizen.System.Information/Usage/ProcessMemoryUsage.cs
index 9583f81..0c4a2a3 100755 (executable)
--- a/src/Tizen.System.Information/Usage/ProcessMemoryUsage.cs
+++ b/src/Tizen.System.Information/Usage/ProcessMemoryUsage.cs
@@ -280,7 +280,7 @@ namespace Tizen.System
             }
             finally
             {
-                Interop.Libc.Free(ptr);
+                Marshal.FreeHGlobal(ptr);
             }
         }
 
@@ -319,7 +319,7 @@ namespace Tizen.System
             }
             finally
             {
-               Interop.Libc.Free(ptr);
+                Marshal.FreeHGlobal(ptr);
             }
 
             Gpus = GetProcessMemoryValueInt(Interop.RuntimeInfo.ProcessMemoryInfoKey.Gpu, pid);