Third times the charm

Author: StanFromIreland

Include/internal/pycore_unicodedata.h Include/internal/pycore_unicodectype.hInclude/internal/pycore_unicodedata.h renamed to Include/internal/pycore_unicodectype.h

@@ -1,5 +1,5 @@
-#ifndef Py_INTERNAL_UNICODEDATA_H
-#define Py_INTERNAL_UNICODEDATA_H
+#ifndef Py_INTERNAL_UNICODECTYPE_H
+#define Py_INTERNAL_UNICODECTYPE_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -14,4 +14,4 @@ PyAPI_FUNC(int) _PyUnicode_IsXidContinue(Py_UCS4 ch);
 #ifdef __cplusplus
 }
 #endif
-#endif /* !Py_INTERNAL_UNICODEDATA_H */
+#endif /* !Py_INTERNAL_UNICODECTYPE_H */

Makefile.pre.in

@@ -1433,9 +1433,9 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/internal/pycore_typeobject.h \
 		$(srcdir)/Include/internal/pycore_typevarobject.h \
 		$(srcdir)/Include/internal/pycore_ucnhash.h \
-		$(srcdir)/Include/internal/pycore_unicodedata.h \
 		$(srcdir)/Include/internal/pycore_unicodeobject.h \
 		$(srcdir)/Include/internal/pycore_unicodeobject_generated.h \
+		$(srcdir)/Include/internal/pycore_unicodectype.h \
 		$(srcdir)/Include/internal/pycore_unionobject.h \
 		$(srcdir)/Include/internal/pycore_uniqueid.h \
 		$(srcdir)/Include/internal/pycore_uop.h \

Modules/unicodedata.c

@@ -19,7 +19,7 @@
 #include "Python.h"
 #include "pycore_object.h"        // _PyObject_VisitType()
 #include "pycore_ucnhash.h"       // _PyUnicode_Name_CAPI
-#include "pycore_unicodedata.h"   // _PyUnicode_IsXidStart, _PyUnicode_IsXidContinue
+#include "pycore_unicodectype.h"   // _PyUnicode_IsXidStart, _PyUnicode_IsXidContinue
 
 #include <stdbool.h>
 #include <stddef.h>               // offsetof()

Objects/unicodectype.c

@@ -9,7 +9,7 @@
 */
 
 #include "Python.h"
-#include "pycore_unicodedata.h"   // export _PyUnicode_IsXidStart(), _PyUnicode_IsXidContinue()
+#include "pycore_unicodectype.h"   // export _PyUnicode_IsXidStart(), _PyUnicode_IsXidContinue()
 
 #define ALPHA_MASK 0x01
 #define DECIMAL_MASK 0x02

PCbuild/pythoncore.vcxproj

@@ -328,9 +328,9 @@
     <ClInclude Include="..\Include\internal\pycore_typevarobject.h" />
     <ClInclude Include="..\Include\internal\pycore_ucnhash.h" />
     <ClInclude Include="..\Include\internal\pycore_unionobject.h" />
-    <ClInclude Include="..\Include\internal\pycore_unicodedata.h" />
     <ClInclude Include="..\Include\internal\pycore_unicodeobject.h" />
     <ClInclude Include="..\Include\internal\pycore_unicodeobject_generated.h" />
+    <ClInclude Include="..\Include\internal\pycore_unicodectype.h" />
     <ClInclude Include="..\Include\internal\pycore_uniqueid.h" />
     <ClInclude Include="..\Include\internal\pycore_warnings.h" />
     <ClInclude Include="..\Include\internal\pycore_weakref.h" />