upstream/mercurial-mirror Commit - r49671:824b2082

17

#include "charencode.h"

17

#include "charencode.h"

18

#include "util.h"

18

#include "util.h"

19

20

#ifdef IS_PY3K

21

/* The mapping of Python types is meant to be temporary to get Python

20

/* The mapping of Python types is meant to be temporary to get Python

22

* 3 to compile. We should remove this once Python 3 support is fully

21

* 3 to compile. We should remove this once Python 3 support is fully

23

* supported and proper types are used in the extensions themselves. */

22

* supported and proper types are used in the extensions themselves. */

25

#define PyInt_FromLong PyLong_FromLong

24

#define PyInt_FromLong PyLong_FromLong

26

#define PyInt_FromSsize_t PyLong_FromSsize_t

25

#define PyInt_FromSsize_t PyLong_FromSsize_t

27

#define PyInt_AsLong PyLong_AsLong

26

#define PyInt_AsLong PyLong_AsLong

28

#else

29

/* Windows on Python 2.7 doesn't define S_IFLNK. Python 3+ defines via

30

* pyport.h. */

31

#ifndef S_IFLNK

32

#define S_IFLNK 0120000

33

#endif

34

#endif

35

27

36

static const char *const versionerrortext = "Python minor version mismatch";

28

static const char *const versionerrortext = "Python minor version mismatch";

37

29

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             #include "charencode.h"
             #include "util.h"
-            #ifdef IS_PY3K
             /* The mapping of Python types is meant to be temporary to get Python
              * 3 to compile. We should remove this once Python 3 support is fully
              * supported and proper types are used in the extensions themselves. */
             #define PyInt_FromLong PyLong_FromLong
             #define PyInt_FromSsize_t PyLong_FromSsize_t
             #define PyInt_AsLong PyLong_AsLong
-            #else
-            /* Windows on Python 2.7 doesn't define S_IFLNK. Python 3+ defines via
-             * pyport.h. */
-            #ifndef S_IFLNK
-            #define S_IFLNK 0120000
-            #endif
-            #endif
             static const char *const versionerrortext = "Python minor version mismatch";