Skip to content

Commit 5dadead

Browse files
authored
Merge pull request #3444 from BsAtHome/fix_python-v313
Configure test and warning fix for python 3.13
2 parents 61df38f + 052a8e9 commit 5dadead

4 files changed

Lines changed: 31 additions & 1 deletion

File tree

src/emc/rs274ngc/gcodemodule.cc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,9 @@ static PyTypeObject LineCodeType = {
174174
0, /*tp_vectorcall*/
175175
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
176176
0, /*tp_watched*/
177+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
178+
0, /*tp_versions_used*/
179+
#endif
177180
#endif
178181
#endif
179182
};

src/emc/usr_intf/axis/extensions/emcmodule.cc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ static PyTypeObject Ini_Type = {
212212
0, /*tp_vectorcall*/
213213
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
214214
0, /*tp_watched*/
215+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
216+
0, /*tp_versions_used*/
217+
#endif
215218
#endif
216219
#endif
217220
};
@@ -891,6 +894,9 @@ static PyTypeObject Stat_Type = {
891894
0, /*tp_vectorcall*/
892895
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
893896
0, /*tp_watched*/
897+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
898+
0, /*tp_versions_used*/
899+
#endif
894900
#endif
895901
#endif
896902
};
@@ -1685,6 +1691,9 @@ static PyTypeObject Command_Type = {
16851691
0, /*tp_vectorcall*/
16861692
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
16871693
0, /*tp_watched*/
1694+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
1695+
0, /*tp_versions_used*/
1696+
#endif
16881697
#endif
16891698
#endif
16901699
};
@@ -1807,6 +1816,9 @@ static PyTypeObject Error_Type = {
18071816
0, /*tp_vectorcall*/
18081817
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
18091818
0, /*tp_watched*/
1819+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
1820+
0, /*tp_versions_used*/
1821+
#endif
18101822
#endif
18111823
#endif
18121824
};
@@ -2538,6 +2550,9 @@ static PyTypeObject PositionLoggerType = {
25382550
0, /*tp_vectorcall*/
25392551
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
25402552
0, /*tp_watched*/
2553+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
2554+
0, /*tp_versions_used*/
2555+
#endif
25412556
#endif
25422557
#endif
25432558
};

src/hal/halmodule.cc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,9 @@ PyTypeObject halobject_type = {
704704
0, /*tp_vectorcall*/
705705
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
706706
0, /*tp_watched*/
707+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
708+
0, /*tp_versions_used*/
709+
#endif
707710
#endif
708711
#endif
709712
};
@@ -866,6 +869,9 @@ PyTypeObject halpin_type = {
866869
0, /*tp_vectorcall*/
867870
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
868871
0, /*tp_watched*/
872+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
873+
0, /*tp_versions_used*/
874+
#endif
869875
#endif
870876
#endif
871877
};
@@ -1671,6 +1677,9 @@ PyTypeObject shm_type = {
16711677
0, /*tp_vectorcall*/
16721678
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
16731679
0, /*tp_watched*/
1680+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
1681+
0, /*tp_versions_used*/
1682+
#endif
16741683
#endif
16751684
#endif
16761685
};
@@ -1918,6 +1927,9 @@ PyTypeObject stream_type = {
19181927
0, /*tp_vectorcall*/
19191928
#if PY_VERSION_HEX >= 0x030c00f0 // 3.12
19201929
0, /*tp_watched*/
1930+
#if PY_VERSION_HEX >= 0x030d00f0 // 3.13
1931+
0, /*tp_versions_used*/
1932+
#endif
19211933
#endif
19221934
#endif
19231935
};

src/m4/ax_python.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
AC_DEFUN([AX_PYTHON],
5656
[AC_MSG_CHECKING(for python build information)
5757
AC_MSG_RESULT([])
58-
for python in python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
58+
for python in python3.13 python3.12 python3.11 python3.10 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
5959
AC_CHECK_PROGS(PYTHON_BIN, [$python])
6060
ax_python_bin=$PYTHON_BIN
6161
if test x$ax_python_bin != x; then

0 commit comments

Comments
 (0)