Patchwork util.h: kill no longer needed definitions for Python < 2.5

login
register
mail settings
Submitter Adrian Buehlmann
Date May 13, 2015, 5:16 p.m.
Message ID <fd6b5512d1a15490b409.1431537367@kork>
Download mbox | patch
Permalink /patch/9058/
State Accepted
Headers show

Comments

Adrian Buehlmann - May 13, 2015, 5:16 p.m.
# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1431536258 -7200
# Node ID fd6b5512d1a15490b40954f43432aaf3da5c1c05
# Parent  10bbdcd8916436f65aa0217b672528acaa0b3db8
util.h: kill no longer needed definitions for Python < 2.5

see e1fb276d4619
Matt Mackall - May 13, 2015, 5:22 p.m.
On Wed, 2015-05-13 at 19:16 +0200, Adrian Buehlmann wrote:
> # HG changeset patch
> # User Adrian Buehlmann <adrian@cadifra.com>
> # Date 1431536258 -7200
> # Node ID fd6b5512d1a15490b40954f43432aaf3da5c1c05
> # Parent  10bbdcd8916436f65aa0217b672528acaa0b3db8
> util.h: kill no longer needed definitions for Python < 2.5

Queued for default, thanks.

Patch

diff --git a/mercurial/util.h b/mercurial/util.h
--- a/mercurial/util.h
+++ b/mercurial/util.h
@@ -101,22 +101,6 @@ 
 
 #endif /* PY_VERSION_HEX */
 
-#if (PY_VERSION_HEX < 0x02050000)
-/* Definitions to get compatibility with python 2.4 and earlier which
-   does not have Py_ssize_t. See also PEP 353.
-   Note: msvc (8 or earlier) does not have ssize_t, so we use Py_ssize_t.
-*/
-typedef int Py_ssize_t;
-typedef Py_ssize_t (*lenfunc)(PyObject *);
-typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t);
-#define PyInt_FromSsize_t PyInt_FromLong
-
-#if !defined(PY_SSIZE_T_MIN)
-#define PY_SSIZE_T_MAX INT_MAX
-#define PY_SSIZE_T_MIN INT_MIN
-#endif
-#endif
-
 #ifdef _WIN32
 #ifdef _MSC_VER
 /* msvc 6.0 has problems */