Commit 2d0a69a4 authored by Larry Hastings's avatar Larry Hastings

Fix Windows build breakage from checkins on Issues #20148 and #20168.

parent b174b85c
This diff is collapsed.
...@@ -2682,8 +2682,6 @@ _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self) ...@@ -2682,8 +2682,6 @@ _tkinter_tktimertoken_deletetimerhandler_impl(TkttObject *self)
Py_RETURN_NONE; Py_RETURN_NONE;
} }
static PyMethodDef Tktt_methods[];
static TkttObject * static TkttObject *
Tktt_New(PyObject *func) Tktt_New(PyObject *func)
{ {
...@@ -2725,22 +2723,6 @@ Tktt_Repr(PyObject *self) ...@@ -2725,22 +2723,6 @@ Tktt_Repr(PyObject *self)
v->func == NULL ? ", handler deleted" : ""); v->func == NULL ? ", handler deleted" : "");
} }
static PyType_Slot Tktt_Type_slots[] = {
{Py_tp_dealloc, Tktt_Dealloc},
{Py_tp_repr, Tktt_Repr},
{Py_tp_methods, Tktt_methods},
{0, 0}
};
static PyType_Spec Tktt_Type_spec = {
"_tkinter.tktimertoken",
sizeof(TkttObject),
0,
Py_TPFLAGS_DEFAULT,
Tktt_Type_slots,
};
/** Timer Handler **/ /** Timer Handler **/
static void static void
...@@ -3001,11 +2983,6 @@ _tkinter_tkapp_willdispatch_impl(TkappObject *self) ...@@ -3001,11 +2983,6 @@ _tkinter_tkapp_willdispatch_impl(TkappObject *self)
} }
/**** Tkapp Method List ****/
static PyMethodDef Tkapp_methods[];
/**** Tkapp Type Methods ****/ /**** Tkapp Type Methods ****/
static void static void
...@@ -3021,21 +2998,6 @@ Tkapp_Dealloc(PyObject *self) ...@@ -3021,21 +2998,6 @@ Tkapp_Dealloc(PyObject *self)
DisableEventHook(); DisableEventHook();
} }
static PyType_Slot Tkapp_Type_slots[] = {
{Py_tp_dealloc, Tkapp_Dealloc},
{Py_tp_methods, Tkapp_methods},
{0, 0}
};
static PyType_Spec Tkapp_Type_spec = {
"_tkinter.tkapp",
sizeof(TkappObject),
0,
Py_TPFLAGS_DEFAULT,
Tkapp_Type_slots,
};
/**** Tkinter Module ****/ /**** Tkinter Module ****/
...@@ -3218,6 +3180,24 @@ static PyMethodDef Tktt_methods[] = ...@@ -3218,6 +3180,24 @@ static PyMethodDef Tktt_methods[] =
{NULL, NULL} {NULL, NULL}
}; };
static PyType_Slot Tktt_Type_slots[] = {
{Py_tp_dealloc, Tktt_Dealloc},
{Py_tp_repr, Tktt_Repr},
{Py_tp_methods, Tktt_methods},
{0, 0}
};
static PyType_Spec Tktt_Type_spec = {
"_tkinter.tktimertoken",
sizeof(TkttObject),
0,
Py_TPFLAGS_DEFAULT,
Tktt_Type_slots,
};
/**** Tkapp Method List ****/
static PyMethodDef Tkapp_methods[] = static PyMethodDef Tkapp_methods[] =
{ {
_TKINTER_TKAPP_WILLDISPATCH_METHODDEF _TKINTER_TKAPP_WILLDISPATCH_METHODDEF
...@@ -3255,6 +3235,21 @@ static PyMethodDef Tkapp_methods[] = ...@@ -3255,6 +3235,21 @@ static PyMethodDef Tkapp_methods[] =
{NULL, NULL} {NULL, NULL}
}; };
static PyType_Slot Tkapp_Type_slots[] = {
{Py_tp_dealloc, Tkapp_Dealloc},
{Py_tp_methods, Tkapp_methods},
{0, 0}
};
static PyType_Spec Tkapp_Type_spec = {
"_tkinter.tkapp",
sizeof(TkappObject),
0,
Py_TPFLAGS_DEFAULT,
Tkapp_Type_slots,
};
static PyMethodDef moduleMethods[] = static PyMethodDef moduleMethods[] =
{ {
_TKINTER__FLATTEN_METHODDEF _TKINTER__FLATTEN_METHODDEF
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment