diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2015-12-22 19:05:30 +0300 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2015-12-22 19:05:30 +0300 |
| commit | e137ff6f7e2594d3ce96b4c74b528d26cc80e11d (patch) | |
| tree | 1f19de887752eaf9b224f6d91badd837a31b6d82 /mcs | |
| parent | ccdf8c3274d1793ffeddedfd784d49707feea62a (diff) | |
| parent | 6d15e070affb30a6a19b3bce06dfb308747b5ae1 (diff) | |
Merge pull request #2034 from alexrp/ctx-cleanup
[runtime] Actually clean up context-static data segments.
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs | 1 | ||||
| -rw-r--r-- | mcs/class/corlib/System/Environment.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs index d94abd59f38..1820cbe7fef 100644 --- a/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs +++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs @@ -55,6 +55,7 @@ namespace System.Runtime.Remoting.Contexts { int domain_id; int context_id; UIntPtr static_data; /* GC-tracked */ + UIntPtr data; #endregion #pragma warning restore 169, 414 diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs index 2553a400be5..d463fb12858 100644 --- a/mcs/class/corlib/System/Environment.cs +++ b/mcs/class/corlib/System/Environment.cs @@ -57,7 +57,7 @@ namespace System { * of icalls, do not require an increment. */ #pragma warning disable 169 - private const int mono_corlib_version = 138; + private const int mono_corlib_version = 139; #pragma warning restore 169 [ComVisible (true)] |