mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Eliminate constness warnings with Tcl 8.4.

Browse source
This commit is contained in:
Martin v. Löwis 2002-10-01 18:08:06 +00:00
parent 0ac885e821
commit 71e25a0e06
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/_tkinter.c
View file

@ -41,6 +41,13 @@ Copyright (C) 1994 Steen Lumholt.
#define MAC_TCL #define MAC_TCL
#endif #endif
/* Starting with Tcl 8.4, many APIs offer const-correctness. Unfortunately,
making _tkinter correct for this API means to break earlier
versions. USE_COMPAT_CONST allows to make _tkinter work with both 8.4 and
earlier versions. Once Tcl releases before 8.4 don't need to be supported
anymore, this should go. */
#define USE_COMPAT_CONST
#ifdef TK_FRAMEWORK #ifdef TK_FRAMEWORK
#include <Tcl/tcl.h> #include <Tcl/tcl.h>
#include <Tk/tk.h> #include <Tk/tk.h>
@ -607,8 +614,8 @@ Tkapp_Call(PyObject *self, PyObject *args)
else { else {
/* We could request the object result here, but doing /* We could request the object result here, but doing
so would confuse applications that expect a string. */ so would confuse applications that expect a string. */
char *s = Tcl_GetStringResult(interp); const char *s = Tcl_GetStringResult(interp);
char *p = s; const char *p = s;
/* If the result contains any bytes with the top bit set, /* If the result contains any bytes with the top bit set,
it's UTF-8 and we should decode it to Unicode */ it's UTF-8 and we should decode it to Unicode */
@ -783,7 +790,8 @@ Tkapp_AddErrorInfo(PyObject *self, PyObject *args)
static PyObject * static PyObject *
SetVar(PyObject *self, PyObject *args, int flags) SetVar(PyObject *self, PyObject *args, int flags)
{ {
char *name1, *name2, *ok, *s; char *name1, *name2, *s;
const char *ok;
PyObject *newValue; PyObject *newValue;
PyObject *tmp; PyObject *tmp;
@ -843,7 +851,8 @@ Tkapp_GlobalSetVar(PyObject *self, PyObject *args)
static PyObject * static PyObject *
GetVar(PyObject *self, PyObject *args, int flags) GetVar(PyObject *self, PyObject *args, int flags)
{ {
char *name1, *name2=NULL, *s; char *name1, *name2=NULL;
const char *s;
PyObject *res = NULL; PyObject *res = NULL;
if (!PyArg_ParseTuple(args, "s|s:getvar", &name1, &name2)) if (!PyArg_ParseTuple(args, "s|s:getvar", &name1, &name2))