Commit c7c96a90 authored by Antoine Pitrou's avatar Antoine Pitrou

Recorded merge of revisions 81029 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines

  Untabify C files. Will watch buildbots.
........
parent ba32864b
......@@ -103,7 +103,7 @@ bytes(cdata)
* CField_Type
*
*/
#define PY_SSIZE_T_CLEAN
#include "Python.h"
......@@ -140,7 +140,7 @@ static PyObject *_unpickle;
char *conversion_mode_encoding = NULL;
char *conversion_mode_errors = NULL;
/****************************************************************/
#if (PY_VERSION_HEX < 0x02040000)
......@@ -825,7 +825,7 @@ static PyTypeObject UnionType_Type = {
0, /* tp_free */
};
/******************************************************************/
/*
......@@ -1061,7 +1061,7 @@ PyTypeObject PointerType_Type = {
0, /* tp_free */
};
/******************************************************************/
/*
ArrayType_Type
......@@ -1455,7 +1455,7 @@ PyTypeObject ArrayType_Type = {
0, /* tp_free */
};
/******************************************************************/
/*
SimpleType_Type
......@@ -2359,7 +2359,7 @@ PyTypeObject CFuncPtrType_Type = {
0, /* tp_free */
};
/*****************************************************************
* Code to keep needed objects alive
*/
......@@ -2924,7 +2924,7 @@ CData_set(PyObject *dst, PyObject *type, SETFUNC setfunc, PyObject *value,
return KeepRef(mem, index, result);
}
/******************************************************************/
static PyObject *
GenericCData_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
......@@ -4007,7 +4007,7 @@ PyTypeObject CFuncPtr_Type = {
CFuncPtr_new, /* tp_new */
0, /* tp_free */
};
/*****************************************************************/
/*
Struct_Type
......@@ -4197,7 +4197,7 @@ static PyTypeObject Union_Type = {
0, /* tp_free */
};
/******************************************************************/
/*
Array_Type
......@@ -4661,7 +4661,7 @@ CreateArrayType(PyObject *itemtype, Py_ssize_t length)
return result;
}
/******************************************************************/
/*
Simple_Type
......@@ -4830,7 +4830,7 @@ static PyTypeObject Simple_Type = {
GenericCData_new, /* tp_new */
0, /* tp_free */
};
/******************************************************************/
/*
Pointer_Type
......@@ -5251,7 +5251,7 @@ PyTypeObject Pointer_Type = {
0, /* tp_free */
};
/******************************************************************/
/*
* Module initialization.
......
......@@ -334,7 +334,7 @@ PyTypeObject CField_Type = {
0, /* tp_free */
};
/******************************************************************/
/*
Accessor functions
......
......@@ -270,7 +270,7 @@ typedef struct {
(void *) v, Py_REFCNT(v)))
/**** Error Handling ****/
static PyObject *Tkinter_TclError;
......@@ -281,7 +281,7 @@ static PyObject *valInCmd;
static PyObject *trbInCmd;
static PyObject *
Tkinter_Error(PyObject *v)
{
......@@ -290,7 +290,7 @@ Tkinter_Error(PyObject *v)
}
/**** Utils ****/
static int Tkinter_busywaitinterval = 20;
......@@ -331,7 +331,7 @@ WaitForMainloop(TkappObject* self)
}
#endif /* WITH_THREAD */
static char *
AsString(PyObject *value, PyObject *tmp)
{
......@@ -364,7 +364,7 @@ AsString(PyObject *value, PyObject *tmp)
}
#define ARGSZ 64
static char *
......@@ -444,7 +444,7 @@ Merge(PyObject *args)
}
static PyObject *
Split(char *list)
{
......@@ -548,7 +548,7 @@ SplitObj(PyObject *arg)
return arg;
}
/**** Tkapp Object ****/
#ifndef WITH_APPINIT
......@@ -575,7 +575,7 @@ Tcl_AppInit(Tcl_Interp *interp)
#endif /* !WITH_APPINIT */
/* Initialize the Tk application; see the `main' function in
* `tkMain.c'.
......@@ -711,7 +711,7 @@ Tkapp_ThreadSend(TkappObject *self, Tcl_Event *ev,
Py_END_ALLOW_THREADS
}
/** Tcl Eval **/
typedef struct {
......@@ -1490,7 +1490,7 @@ Tkapp_AddErrorInfo(PyObject *self, PyObject *args)
}
/** Tcl Variable **/
TCL_DECLARE_MUTEX(var_mutex)
......@@ -1655,7 +1655,7 @@ Tkapp_GlobalSetVar(PyObject *self, PyObject *args)
}
static PyObject *
GetVar(PyObject *self, PyObject *args, int flags)
{
......@@ -1697,7 +1697,7 @@ Tkapp_GlobalGetVar(PyObject *self, PyObject *args)
}
static PyObject *
UnsetVar(PyObject *self, PyObject *args, int flags)
{
......@@ -1734,7 +1734,7 @@ Tkapp_GlobalUnsetVar(PyObject *self, PyObject *args)
}
/** Tcl to Python **/
static PyObject *
......@@ -1891,7 +1891,7 @@ Tkapp_ExprBoolean(PyObject *self, PyObject *args)
}
static PyObject *
Tkapp_SplitList(PyObject *self, PyObject *args)
{
......@@ -1970,7 +1970,7 @@ Tkapp_Merge(PyObject *self, PyObject *args)
}
/** Tcl Command **/
/* Client data struct */
......@@ -2054,7 +2054,7 @@ PythonCmdDelete(ClientData clientData)
}
TCL_DECLARE_MUTEX(command_mutex)
......@@ -2142,7 +2142,7 @@ Tkapp_CreateCommand(PyObject *selfptr, PyObject *args)
}
static PyObject *
Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args)
{
......@@ -2178,7 +2178,7 @@ Tkapp_DeleteCommand(PyObject *selfptr, PyObject *args)
}
#ifdef HAVE_CREATEFILEHANDLER
/** File Handler **/
......@@ -2332,7 +2332,7 @@ Tkapp_DeleteFileHandler(PyObject *self, PyObject *args)
}
#endif /* HAVE_CREATEFILEHANDLER */
/**** Tktt Object (timer token) ****/
static PyTypeObject Tktt_Type;
......@@ -2435,7 +2435,7 @@ static PyTypeObject Tktt_Type =
};
/** Timer Handler **/
static void
......@@ -2504,7 +2504,7 @@ Tkapp_CreateTimerHandler(PyObject *self, PyObject *args)
return (PyObject *) v;
}
/** Event Loop **/
static PyObject *
......@@ -2694,7 +2694,7 @@ Tkapp_WillDispatch(PyObject *self, PyObject *args)
return Py_None;
}
/**** Tkapp Method List ****/
static PyMethodDef Tkapp_methods[] =
......@@ -2740,7 +2740,7 @@ static PyMethodDef Tkapp_methods[] =
};
/**** Tkapp Type Methods ****/
static void
......@@ -2779,7 +2779,7 @@ static PyTypeObject Tkapp_Type =
};
/**** Tkinter Module ****/
typedef struct {
......
This diff is collapsed.
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