Clarify nested UCS2/4 PY2/3 directives

vmuriart · vmuriart · commit 4f298019722c · 2017-01-29T13:53:48.000-07:00
Clearly shows what each section does
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -1590,8 +1590,7 @@ internal static bool PyUnicode_Check(IntPtr ob)
             return PyObject_TYPE(ob) == Runtime.PyUnicodeType;
         }
 
-#if (UCS2)
-#if (PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
+#if UCS2 && PYTHON3
     [DllImport(Runtime.dll, CallingConvention=CallingConvention.Cdecl,
         ExactSpelling=true, CharSet=CharSet.Unicode)]
     internal unsafe static extern IntPtr
@@ -1633,8 +1632,7 @@ internal unsafe static extern IntPtr
         ExactSpelling = true, CharSet = CharSet.Unicode)]
     internal unsafe static extern IntPtr
     PyUnicode_FromOrdinal(int c);
-
-#else
+#elif UCS2 && PYTHON2
     [DllImport(Runtime.dll, CallingConvention=CallingConvention.Cdecl,
            EntryPoint="PyUnicodeUCS2_FromObject",
         ExactSpelling=true, CharSet=CharSet.Unicode)]
@@ -1676,10 +1674,7 @@ internal unsafe static extern IntPtr
         ExactSpelling=true, CharSet=CharSet.Unicode)]
     internal unsafe static extern IntPtr
     PyUnicode_FromOrdinal(int c);
-#endif
-#endif
-#if (UCS4)
-#if (PYTHON33 || PYTHON34 || PYTHON35 || PYTHON36)
+#elif UCS4 && PYTHON3
     [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
         ExactSpelling=true, CharSet=CharSet.Unicode)]
     internal unsafe static extern IntPtr
@@ -1723,8 +1718,7 @@ internal unsafe static extern IntPtr
         ExactSpelling = true, CharSet = CharSet.Unicode)]
     internal unsafe static extern IntPtr
     PyUnicode_FromOrdinal(int c);
-
-#else
+#elif UCS4 && PYTHON2
         [DllImport(Runtime.dll, CallingConvention = CallingConvention.Cdecl,
             EntryPoint = "PyUnicodeUCS4_FromObject",
             ExactSpelling = true, CharSet = CharSet.Unicode)]
@@ -1768,8 +1762,6 @@ internal unsafe static extern IntPtr
             ExactSpelling = true, CharSet = CharSet.Unicode)]
         internal unsafe static extern IntPtr
             PyUnicode_FromOrdinal(int c);
-
-#endif
 #endif
 
         internal static IntPtr PyUnicode_FromString(string s)
