Remove Runtime._UCS dependency from CustomMarshaler

filmor · filmor · commit ca99b178cf5f · 2019-12-15T16:13:13.000+01:00
diff --git a/Python.Runtime/CustomMarshaler.cs b/Python.Runtime/CustomMarshaler.cs
@@ -91,9 +91,11 @@ public static int GetUnicodeByteLength(IntPtr p)
             var len = 0;
             while (true)
             {
-                int c = Runtime._UCS == 2
-                    ? Marshal.ReadInt16(p, len * 2)
-                    : Marshal.ReadInt32(p, len * 4);
+#if UCS2
+                int c = Marshal.ReadInt16(p, len * 2);
+#else
+                int c = Marshal.ReadInt32(p, len * 4);
+#endif
 
                 if (c == 0)
                 {

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,11 @@ public static int GetUnicodeByteLength(IntPtr p)`
`91`	`91`	`var len = 0;`
`92`	`92`	`while (true)`
`93`	`93`	`{`
`94`		`- int c = Runtime._UCS == 2`
`95`		`- ? Marshal.ReadInt16(p, len * 2)`
`96`		`- : Marshal.ReadInt32(p, len * 4);`
	`94`	`+#if UCS2`
	`95`	`+ int c = Marshal.ReadInt16(p, len * 2);`
	`96`	`+#else`
	`97`	`+ int c = Marshal.ReadInt32(p, len * 4);`
	`98`	`+#endif`
`97`	`99`
`98`	`100`	`if (c == 0)`
`99`	`101`	`{`