bpo-35134, Include: Move pytime.h to cpython/pytime.h (GH-23988)

This change is backward compatible since C extension modules
must not include "pytime.h" directly, but only include "Python.h".

diff --git a/Include/Python.h b/Include/Python.h
index 57f71d41d8d47768003d66025032b031c442c94e..76ead9e5765ec8100f8213f581a937c3006c3849 100644 (file)
--- a/Include/Python.h
+++ b/Include/Python.h
@@ -82,7 +82,6 @@
 #error "PYMALLOC_DEBUG requires WITH_PYMALLOC"
 #endif
 #include "pymath.h"
-#include "pytime.h"
 #include "pymem.h"
 
 #include "object.h"
@@ -128,6 +127,7 @@
 #include "structseq.h"
 #include "namespaceobject.h"
 #include "picklebufobject.h"
+#include "cpython/pytime.h"
 
 #include "codecs.h"
 #include "pyerrors.h"

diff --git a/Include/pytime.h b/Include/cpython/pytime.h
similarity index 99%
rename from Include/pytime.h
rename to Include/cpython/pytime.h
index 944170f7d0c4c3dc69a25a205a532188da1f6c2c..56607d199ed542da7448cea7272ee84fe48713eb 100644 (file)
--- a/Include/pytime.h
+++ b/Include/cpython/pytime.h
@@ -2,9 +2,6 @@
 #ifndef Py_PYTIME_H
 #define Py_PYTIME_H
 
-#include "pyconfig.h" /* include for defines */
-#include "object.h"
-
 /**************************************************************************
 Symbols and macros to supply platform-independent interfaces to time related
 functions and constants

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 0b22bdd5591b9d881e6f5a4900880f3e96cf6887..0d9fdc713406c0de4447a5530d4db923e7f711a0 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1075,7 +1075,6 @@ PYTHON_HEADERS= \
                $(srcdir)/Include/pystrtod.h \
                $(srcdir)/Include/pythonrun.h \
                $(srcdir)/Include/pythread.h \
-               $(srcdir)/Include/pytime.h \
                $(srcdir)/Include/rangeobject.h \
                $(srcdir)/Include/setobject.h \
                $(srcdir)/Include/sliceobject.h \
@@ -1116,6 +1115,7 @@ PYTHON_HEADERS= \
                $(srcdir)/Include/cpython/pymem.h \
                $(srcdir)/Include/cpython/pystate.h \
                $(srcdir)/Include/cpython/pythonrun.h \
+               $(srcdir)/Include/cpython/pytime.h \
                $(srcdir)/Include/cpython/sysmodule.h \
                $(srcdir)/Include/cpython/traceback.h \
                $(srcdir)/Include/cpython/tupleobject.h \

diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
index fdbba6a7afc29db1e45b2876afa0d7cf62517bee..f0d569949082331801af97aa269ce637916becdc 100644 (file)
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -31,7 +31,6 @@
 #include "pycore_pyerrors.h"
 #include "pycore_pystate.h"     // _PyThreadState_GET()
 #include "pydtrace.h"
-#include "pytime.h"             // _PyTime_GetMonotonicClock()
 
 typedef struct _gc_runtime_state GCState;
 

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index f172f2a5786c639518472f0014ddf7a14f9f71a7..711a68fcc5c7ad9ca263b1449cd56d843d9a1322 100644 (file)
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -147,6 +147,7 @@
     <ClInclude Include="..\Include\cpython\pymem.h" />
     <ClInclude Include="..\Include\cpython\pystate.h" />
     <ClInclude Include="..\Include\cpython\pythonrun.h" />
+    <ClInclude Include="..\Include\cpython\pytime.h" />
     <ClInclude Include="..\Include\cpython\sysmodule.h" />
     <ClInclude Include="..\Include\cpython\traceback.h" />
     <ClInclude Include="..\Include\cpython\tupleobject.h" />
@@ -245,7 +246,6 @@
     <ClInclude Include="..\Include\pystrtod.h" />
     <ClInclude Include="..\Include\pythonrun.h" />
     <ClInclude Include="..\Include\pythread.h" />
-    <ClInclude Include="..\Include\pytime.h" />
     <ClInclude Include="..\Include\rangeobject.h" />
     <ClInclude Include="..\Include\setobject.h" />
     <ClInclude Include="..\Include\sliceobject.h" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index 3bafdb8d297117a6a791e6b73a08380dfeb7513e..ab826427acc688880d1103e83993d8b88fd5aad8 100644 (file)
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -204,9 +204,6 @@
     <ClInclude Include="..\Include\pymath.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\pytime.h">
-      <Filter>Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\pymacro.h">
       <Filter>Include</Filter>
     </ClInclude>
@@ -450,6 +447,9 @@
     <ClInclude Include="..\Include\cpython\pylifecycle.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\cpython\pytime.h">
+      <Filter>Include\cpython</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\cpython\tupleobject.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>