@@ -412,7 +412,7 @@ extern char *_ctypes_conversion_errors;

#endif

/* Python's PyUnicode_*WideChar functions are broken ... */

# define CTYPES_UNICODE

#endif

@@ -205,6 +205,7 @@ PyDoc_STRVAR(localeconv__doc__,

static PyObject*

PyLocale_localeconv(PyObject* self)

{

PyObject* result;

struct lconv *l;

PyObject *x;

@@ -265,6 +266,7 @@ PyLocale_localeconv(PyObject* self)

failed:

Py_XDECREF(result);

Py_XDECREF(x);

return NULL;

}

@@ -155,7 +155,7 @@ corresponding Unix manual entries for mo

#endif

#define HAVE_SYSTEM 1

#define HAVE_WAIT 1

#endif /* PYOS_OS2 && PYCC_GCC && __VMS */

#endif /* _MSC_VER */

#endif /* __BORLANDC__ */

@@ -9508,5 +9508,3 @@ INITFUNC(void)

#ifdef __cplusplus

}

#endif

@@ -68,14 +68,14 @@ mkpwent(struct passwd *p)

#define SETS(i,val) sets(v, i, val)

SETS(setIndex++, p->pw_name);

SETS(setIndex++, "");

#else

SETS(setIndex++, p->pw_passwd);

#endif

PyStructSequence_SET_ITEM(v, setIndex++, _PyInt_FromUid(p->pw_uid));

PyStructSequence_SET_ITEM(v, setIndex++, _PyInt_FromGid(p->pw_gid));

SETS(setIndex++, "");

#else

SETS(setIndex++, p->pw_gecos);

@@ -227,6 +227,7 @@ termios_tcsendbreak(PyObject *self, PyOb

return Py_None;

}

PyDoc_STRVAR(termios_tcdrain__doc__,

"tcdrain(fd) -> None\n\

\n\

@@ -246,6 +247,7 @@ termios_tcdrain(PyObject *self, PyObject

Py_INCREF(Py_None);

return Py_None;

}

PyDoc_STRVAR(termios_tcflush__doc__,

"tcflush(fd, queue) -> None\n\

@@ -301,8 +303,8 @@ static PyMethodDef termios_methods[] =

METH_VARARGS, termios_tcsetattr__doc__},

{"tcsendbreak", termios_tcsendbreak,

METH_VARARGS, termios_tcsendbreak__doc__},

{"tcflush", termios_tcflush,

METH_VARARGS, termios_tcflush__doc__},

{"tcflow", termios_tcflow,

@@ -831,13 +831,14 @@ PyLong_AsVoidPtr(PyObject *vv)

return (void *)x;

}

#ifdef HAVE_LONG_LONG

/* Initial PY_LONG_LONG support by Chris Herborth (chrish@qnx.com), later

* rewritten to use the newer PyLong_{As,From}ByteArray API.

*/

#define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN)

/* Create a new long int object from a C PY_LONG_LONG int. */

@@ -910,28 +911,6 @@ PyLong_FromUnsignedLongLong(unsigned PY_

return (PyObject *)v;

}

/* Get a C PY_LONG_LONG int from a long int object.

Return -1 and set an error if overflow occurs. */

@@ -1140,10 +1119,31 @@ PyLong_AsLongLongAndOverflow(PyObject *v

return res;

}

#endif /* HAVE_LONG_LONG */

static int

convert_binop(PyObject *v, PyObject *w, PyLongObject **a, PyLongObject **b) {

@@ -640,10 +640,9 @@ get_locale_info(int type, LocaleInfo *lo

{

switch (type) {

case LT_CURRENT_LOCALE: {

break;

}

case LT_DEFAULT_LOCALE:

@@ -202,9 +202,8 @@ _Py_InsertThousandsGroupingLocale(STRING

Py_ssize_t n_digits,

Py_ssize_t min_width)

{

return _Py_InsertThousandsGrouping(buffer, n_buffer, digits, n_digits,

min_width, grouping, thousands_sep);