This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9867

cext: restore the ability to build on Windows with py2
ClosedPublic

Authored by mharbison72 on Jan 25 2021, 7:26 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG38b9a63d3a13: cext: restore the ability to build on Windows with py2
rHGab2d02e12dbb: cext: restore the ability to build on Windows with py2
Summary

This broke in e92ca942ddca.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Jan 25 2021, 7:26 PM
pulkit accepted this revision.Jan 26 2021, 2:59 PM
This revision is now accepted and ready to land.Jan 26 2021, 2:59 PM
vstinner added a subscriber: vstinner.Jan 26 2021, 6:15 PM

I installed Visual C++ 2008 for Python 2.7 and I confirm that this version doesn't support the "inline" keyword.

Can you please try the following pull request? https://github.com/pythoncapi/pythoncapi_compat/pull/3 If it works, I merge it in pythoncapi_compat and then you can copy the updated file into Mercurial and python-zstandard.

mharbison72 added a comment.Jan 26 2021, 6:35 PM
In D9867#149672, @vstinner wrote:

I installed Visual C++ 2008 for Python 2.7 and I confirm that this version doesn't support the "inline" keyword.
Can you please try the following pull request? https://github.com/pythoncapi/pythoncapi_compat/pull/3 If it works, I merge it in pythoncapi_compat and then you can copy the updated file into Mercurial and python-zstandard.

I pasted that file into Mercurial, reverted the other changes that don't appear in this diff, and it does compile on py2 and py3 now.

vstinner added a comment.Jan 26 2021, 6:43 PM

I pasted that file into Mercurial, reverted the other changes that don't appear in this diff, and it does compile on py2 and py3 now.

Nice! I merged my PR. I suggest you to simply copy the updated file from:

For now I suggest to embed a copy of this header file in your project. You should not need to update it unless you need new functions (which will be added later).

vstinner added a comment.Feb 3 2021, 5:51 AM

Oh, cool! I see that someone updated mercurial/pythoncapi_compat.h and contrib/python-zstandard/zstd/common/pythoncapi_compat.h to retrieve my VS 2008 fix!

I created https://github.com/indygreg/python-zstandard/pull/135 to update python-zstandard upstream ;-)

Revision Contents
Changeset List

Diff 25249

contrib/python-zstandard/zstd/common/pythoncapi_compat.h

#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <Python.h> #include <Python.h>
#include "frameobject.h" // PyFrameObject, PyFrame_GetBack() #include "frameobject.h" // PyFrameObject, PyFrame_GetBack()
/* VC 2008 doesn't know about the inline keyword. */
#if defined(_MSC_VER) && _MSC_VER < 1900
#define inline __forceinline
#endif
// Cast argument to PyObject* type. // Cast argument to PyObject* type.
#ifndef _PyObject_CAST #ifndef _PyObject_CAST
# define _PyObject_CAST(op) ((PyObject*)(op)) # define _PyObject_CAST(op) ((PyObject*)(op))
#endif #endif
// bpo-42262 added Py_NewRef() to Python 3.10.0a3 // bpo-42262 added Py_NewRef() to Python 3.10.0a3
#if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_NewRef) #if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_NewRef)

mercurial/pythoncapi_compat.h

#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <Python.h> #include <Python.h>
#include "frameobject.h" // PyFrameObject, PyFrame_GetBack() #include "frameobject.h" // PyFrameObject, PyFrame_GetBack()
/* VC 2008 doesn't know about the inline keyword. */
#if defined(_MSC_VER) && _MSC_VER < 1900
#define inline __forceinline
#endif
// Cast argument to PyObject* type. // Cast argument to PyObject* type.
#ifndef _PyObject_CAST #ifndef _PyObject_CAST
# define _PyObject_CAST(op) ((PyObject*)(op)) # define _PyObject_CAST(op) ((PyObject*)(op))
#endif #endif
// bpo-42262 added Py_NewRef() to Python 3.10.0a3 // bpo-42262 added Py_NewRef() to Python 3.10.0a3
#if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_NewRef) #if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_NewRef)