bpo-35134, Include: Move pytime.h to cpython/pytime.h (GH-23988) · python/cpython@17dbd40 (original) (raw)

Skip to content

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sign up

Appearance settings

Commit 17dbd40

author

Nicholas Sim

authored

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

File tree

6 files changed

lines changed

6 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -82,7 +82,6 @@
82 82 #error "PYMALLOC_DEBUG requires WITH_PYMALLOC"
83 83 #endif
84 84 #include "pymath.h"
85 -#include "pytime.h"
86 85 #include "pymem.h"
87 86
88 87 #include "object.h"
@@ -128,6 +127,7 @@
128 127 #include "structseq.h"
129 128 #include "namespaceobject.h"
130 129 #include "picklebufobject.h"
130 +#include "cpython/pytime.h"
131 131
132 132 #include "codecs.h"
133 133 #include "pyerrors.h"
Original file line number Diff line number Diff line change
@@ -2,9 +2,6 @@
2 2 #ifndef Py_PYTIME_H
3 3 #define Py_PYTIME_H
4 4
5 -#include "pyconfig.h" /* include for defines */
6 -#include "object.h"
7 -
8 5 /**************************************************************************
9 6 Symbols and macros to supply platform-independent interfaces to time related
10 7 functions and constants
Original file line number Diff line number Diff line change
@@ -1075,7 +1075,6 @@ PYTHON_HEADERS= \
1075 1075 $(srcdir)/Include/pystrtod.h \
1076 1076 $(srcdir)/Include/pythonrun.h \
1077 1077 $(srcdir)/Include/pythread.h \
1078 - $(srcdir)/Include/pytime.h \
1079 1078 $(srcdir)/Include/rangeobject.h \
1080 1079 $(srcdir)/Include/setobject.h \
1081 1080 $(srcdir)/Include/sliceobject.h \
@@ -1116,6 +1115,7 @@ PYTHON_HEADERS= \
1116 1115 $(srcdir)/Include/cpython/pymem.h \
1117 1116 $(srcdir)/Include/cpython/pystate.h \
1118 1117 $(srcdir)/Include/cpython/pythonrun.h \
1118 + $(srcdir)/Include/cpython/pytime.h \
1119 1119 $(srcdir)/Include/cpython/sysmodule.h \
1120 1120 $(srcdir)/Include/cpython/traceback.h \
1121 1121 $(srcdir)/Include/cpython/tupleobject.h \
Original file line number Diff line number Diff line change
@@ -31,7 +31,6 @@
31 31 #include "pycore_pyerrors.h"
32 32 #include "pycore_pystate.h" // _PyThreadState_GET()
33 33 #include "pydtrace.h"
34 -#include "pytime.h" // _PyTime_GetMonotonicClock()
35 34
36 35 typedef struct _gc_runtime_state GCState;
37 36
Original file line number Diff line number Diff line change
@@ -147,6 +147,7 @@
147 147 <ClInclude Include="..\Include\cpython\pymem.h" />
148 148 <ClInclude Include="..\Include\cpython\pystate.h" />
149 149 <ClInclude Include="..\Include\cpython\pythonrun.h" />
150 + <ClInclude Include="..\Include\cpython\pytime.h" />
150 151 <ClInclude Include="..\Include\cpython\sysmodule.h" />
151 152 <ClInclude Include="..\Include\cpython\traceback.h" />
152 153 <ClInclude Include="..\Include\cpython\tupleobject.h" />
@@ -245,7 +246,6 @@
245 246 <ClInclude Include="..\Include\pystrtod.h" />
246 247 <ClInclude Include="..\Include\pythonrun.h" />
247 248 <ClInclude Include="..\Include\pythread.h" />
248 - <ClInclude Include="..\Include\pytime.h" />
249 249 <ClInclude Include="..\Include\rangeobject.h" />
250 250 <ClInclude Include="..\Include\setobject.h" />
251 251 <ClInclude Include="..\Include\sliceobject.h" />
Original file line number Diff line number Diff line change
@@ -204,9 +204,6 @@
204 204 <ClInclude Include="..\Include\pymath.h">
205 205 <Filter>Include</Filter>
206 206 </ClInclude>
207 - <ClInclude Include="..\Include\pytime.h">
208 - <Filter>Include</Filter>
209 - </ClInclude>
210 207 <ClInclude Include="..\Include\pymacro.h">
211 208 <Filter>Include</Filter>
212 209 </ClInclude>
@@ -450,6 +447,9 @@
450 447 <ClInclude Include="..\Include\cpython\pylifecycle.h">
451 448 <Filter>Include\cpython</Filter>
452 449 </ClInclude>
450 + <ClInclude Include="..\Include\cpython\pytime.h">
451 + <Filter>Include\cpython</Filter>
452 + </ClInclude>
453 453 <ClInclude Include="..\Include\cpython\tupleobject.h">
454 454 <Filter>Include\cpython</Filter>
455 455 </ClInclude>