Fix runtime Initialize dll nameclash

vmuriart · vmuriart · commit ecd7e601558c · 2017-02-23T22:58:07.000-07:00
Looks like dllLocal never changes from IntPtr.Zero
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -289,16 +289,16 @@ internal static void Initialize()
             Error = new IntPtr(-1);
 
 #if PYTHON3
-            IntPtr dll = IntPtr.Zero;
+            IntPtr dllLocal = IntPtr.Zero;
             if (Runtime.dll != "__Internal")
             {
                 NativeMethods.LoadLibrary(Runtime.dll);
             }
-            _PyObject_NextNotImplemented = NativeMethods.GetProcAddress(dll, "_PyObject_NextNotImplemented");
+            _PyObject_NextNotImplemented = NativeMethods.GetProcAddress(dllLocal, "_PyObject_NextNotImplemented");
 #if !(MONO_LINUX || MONO_OSX)
-            if (dll != IntPtr.Zero)
+            if (dllLocal != IntPtr.Zero)
             {
-                NativeMethods.FreeLibrary(dll);
+                NativeMethods.FreeLibrary(dllLocal);
             }
 #endif
 #endif

Original file line number	Diff line number	Diff line change
`@@ -289,16 +289,16 @@ internal static void Initialize()`
`289`	`289`	`Error = new IntPtr(-1);`
`290`	`290`
`291`	`291`	`#if PYTHON3`
`292`		`- IntPtr dll = IntPtr.Zero;`
	`292`	`+ IntPtr dllLocal = IntPtr.Zero;`
`293`	`293`	`if (Runtime.dll != "__Internal")`
`294`	`294`	`{`
`295`	`295`	`NativeMethods.LoadLibrary(Runtime.dll);`
`296`	`296`	`}`
`297`		`- _PyObject_NextNotImplemented = NativeMethods.GetProcAddress(dll, "_PyObject_NextNotImplemented");`
	`297`	`+ _PyObject_NextNotImplemented = NativeMethods.GetProcAddress(dllLocal, "_PyObject_NextNotImplemented");`
`298`	`298`	`#if !(MONO_LINUX \|\| MONO_OSX)`
`299`		`- if (dll != IntPtr.Zero)`
	`299`	`+ if (dllLocal != IntPtr.Zero)`
`300`	`300`	`{`
`301`		`- NativeMethods.FreeLibrary(dll);`
	`301`	`+ NativeMethods.FreeLibrary(dllLocal);`
`302`	`302`	`}`
`303`	`303`	`#endif`
`304`	`304`	`#endif`