[Python-checkins] python/dist/src/Modules _tkinter.c,1.140,1.141

[jlt63@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv19470/Modules

Modified Files:
	_tkinter.c 
Log Message:
Patch #660485: Cygwin _tkinter Tcl/Tk 8.3 patch

The attached patch enables Cygwin Python to 
build cleanly against the latest Cygwin Tcl/Tk 
which is based on Tcl/Tk 8.3. It also prevents 
building against the real X headers, if installed.


Index: _tkinter.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_tkinter.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** _tkinter.c	31 Dec 2002 17:34:30 -0000	1.140
--- _tkinter.c	31 Dec 2002 20:29:32 -0000	1.141
***************
*** 58,64 ****
  #endif
  
! /* For Tcl 8.2 and 8.3, CONST* is not defined. */
  #ifndef CONST84_RETURN
  #define CONST84_RETURN
  #define CONST
  #endif
--- 58,65 ----
  #endif
  
! /* For Tcl 8.2 and 8.3, CONST* is not defined (except on Cygwin). */
  #ifndef CONST84_RETURN
  #define CONST84_RETURN
+ #undef CONST
  #define CONST
  #endif
***************
*** 753,757 ****
          0,                      /*tp_call*/
          (reprfunc)PyTclObject_str,        /*tp_str*/
!         PyObject_GenericGetAttr,/*tp_getattro*/
          0,                      /*tp_setattro*/
          0,                      /*tp_as_buffer*/
--- 754,758 ----
          0,                      /*tp_call*/
          (reprfunc)PyTclObject_str,        /*tp_str*/
!         0,                      /*tp_getattro*/
          0,                      /*tp_setattro*/
          0,                      /*tp_as_buffer*/
***************
*** 2839,2842 ****
--- 2840,2844 ----
  
  	PyTclObject_Type.ob_type = &PyType_Type;
+ 	PyTclObject_Type.tp_getattro = &PyObject_GenericGetAttr;
  	PyDict_SetItemString(d, "Tcl_Obj", (PyObject *)&PyTclObject_Type);