# HG changeset patch # User Matt Harbison # Date 2021-01-26 00:03:27 # Node ID 38b9a63d3a13176a2d83a13898d51fe617e5ecda # Parent d8ad391e10f501c817ae80a88050a7cb78a1e782 cext: restore the ability to build on Windows with py2 This broke in e92ca942ddca. Differential Revision: https://phab.mercurial-scm.org/D9867 diff --git a/contrib/python-zstandard/zstd/common/pythoncapi_compat.h b/contrib/python-zstandard/zstd/common/pythoncapi_compat.h --- a/contrib/python-zstandard/zstd/common/pythoncapi_compat.h +++ b/contrib/python-zstandard/zstd/common/pythoncapi_compat.h @@ -20,6 +20,11 @@ extern "C" { #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. #ifndef _PyObject_CAST # define _PyObject_CAST(op) ((PyObject*)(op)) diff --git a/mercurial/pythoncapi_compat.h b/mercurial/pythoncapi_compat.h --- a/mercurial/pythoncapi_compat.h +++ b/mercurial/pythoncapi_compat.h @@ -20,6 +20,11 @@ extern "C" { #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. #ifndef _PyObject_CAST # define _PyObject_CAST(op) ((PyObject*)(op))