Move mimalloc headers into internal header directory

Author: tiran

.gitignore

@@ -139,8 +139,8 @@ Tools/ssl/win32
 Tools/freeze/test/outdir
 
 # unused mimalloc files
-Include/mimalloc/mimalloc-new-delete.h
-Include/mimalloc/mimalloc-override.h
+Include/internal/mimalloc/mimalloc-new-delete.h
+Include/internal/mimalloc/mimalloc-override.h
 
 # The frozen modules are always generated by the build so we don't
 # keep them in the repo.  Also see Tools/scripts/freeze_modules.py.

Include/mimalloc/mimalloc-atomic.h renamed to Include/internal/mimalloc/mimalloc-atomic.h

@@ -349,10 +349,10 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
 
 MIMALLOC_HEADERS = \
 		$(srcdir)/Include/internal/pycore_mimalloc.h \
-		$(srcdir)/Include/mimalloc/mimalloc-atomic.h \
-		$(srcdir)/Include/mimalloc/mimalloc.h \
-		$(srcdir)/Include/mimalloc/mimalloc-internal.h \
-		$(srcdir)/Include/mimalloc/mimalloc-types.h \
+		$(srcdir)/Include/internal/mimalloc/mimalloc-atomic.h \
+		$(srcdir)/Include/internal/mimalloc/mimalloc.h \
+		$(srcdir)/Include/internal/mimalloc/mimalloc-internal.h \
+		$(srcdir)/Include/internal/mimalloc/mimalloc-types.h \
 
 MIMALLOC_INCLUDES = \
 		$(srcdir)/Objects/mimalloc/alloc-aligned.c \
@@ -1280,7 +1280,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
 
 Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h @MIMALLOC_INCLUDES@
 	$(CC) -c $(PY_CORE_CFLAGS) \
-		-I$(srcdir)/Include/mimalloc \
+		-I$(srcdir)/Include/internal/mimalloc \
 		-DABIFLAGS='"$(ABIFLAGS)"' \
 		$(MULTIARCH_CPPFLAGS) \
 		-o $@ $(srcdir)/Python/sysmodule.c
@@ -2144,6 +2144,11 @@ inclinstall:
 		echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal; \
 		$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal; \
 	done
+	@for i in $(srcdir)/Include/internal/mimalloc/*.h; \
+	do \
+		echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal/mimalloc; \
+		$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal/mimalloc; \
+	done
 	$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
 
 # Install the library and miscellaneous stuff needed for extending/embedding
@@ -2313,7 +2318,7 @@ Python/dtoa.o: Python/dtoa.c
 
 # obmalloc includes mimalloc
 Objects/obmalloc.o: Objects/obmalloc.c @MIMALLOC_INCLUDES@
-	$(CC) -c $(PY_CORE_CFLAGS) -I$(srcdir)/Include/mimalloc -o $@ $<
+	$(CC) -c $(PY_CORE_CFLAGS) -I$(srcdir)/Include/internal/mimalloc -o $@ $<
 
 # Run reindent on the library
 reindent:

Include/mimalloc/mimalloc-internal.h renamed to Include/internal/mimalloc/mimalloc-internal.h

@@ -29,7 +29,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(PySourcePath)Include;$(PySourcePath)Include\internal;$(PySourcePath)Include\mimalloc;$(PySourcePath)PC;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(PySourcePath)Include;$(PySourcePath)Include\internal;$(PySourcePath)Include\internal\mimalloc;$(PySourcePath)PC;$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;$(_Py3NamePreprocessorDefinition);$(_PlatformPreprocessorDefinition)$(_DebugPreprocessorDefinition)$(_PydPreprocessorDefinition)%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <Optimization>MaxSpeed</Optimization>

Include/mimalloc/mimalloc-types.h renamed to Include/internal/mimalloc/mimalloc-types.h

@@ -156,10 +156,6 @@
     <ClInclude Include="..\Include\cpython\longintrepr.h" />
     <ClInclude Include="..\Include\cpython\longobject.h" />
     <ClInclude Include="..\Include\cpython\methodobject.h" />
-    <ClInclude Include="..\Include\mimalloc\mimalloc-atomic.h" />
-    <ClInclude Include="..\Include\mimalloc\mimalloc.h" />
-    <ClInclude Include="..\Include\mimalloc\mimalloc-internal.h" />
-    <ClInclude Include="..\Include\mimalloc\mimalloc-types.h" />
     <ClInclude Include="..\Include\cpython\object.h" />
     <ClInclude Include="..\Include\cpython\objimpl.h" />
     <ClInclude Include="..\Include\cpython\odictobject.h" />
@@ -192,6 +188,10 @@
     <ClInclude Include="..\Include\floatobject.h" />
     <ClInclude Include="..\Include\frameobject.h" />
     <ClInclude Include="..\Include\import.h" />
+    <ClInclude Include="..\Include\internal\mimalloc\mimalloc-atomic.h" />
+    <ClInclude Include="..\Include\internal\mimalloc\mimalloc.h" />
+    <ClInclude Include="..\Include\internal\mimalloc\mimalloc-internal.h" />
+    <ClInclude Include="..\Include\internal\mimalloc\mimalloc-types.h" />
     <ClInclude Include="..\Include\internal\pycore_abstract.h" />
     <ClInclude Include="..\Include\internal\pycore_accu.h" />
     <ClInclude Include="..\Include\internal\pycore_asdl.h" />