[PATCH] zstd: fix compilation with Solaris Studio

Gregory Szorc gregory.szorc at gmail.com
Tue Nov 22 17:07:51 EST 2016


On Tue, Nov 22, 2016 at 1:34 PM, <danek.duvall at oracle.com> wrote:

> # HG changeset patch
> # User Danek Duvall <danek.duvall at oracle.com>
> # Date 1479850325 28800
> #      Tue Nov 22 13:32:05 2016 -0800
> # Node ID b09fb7f66e9e680358b8fb359be24a14fd6b3cfb
> # Parent  8836f13e3c5b8eae765372708b659c55a044cbb4
> zstd: fix compilation with Solaris Studio
>
> Without these changes, Solaris Studio (12.4) gives us "syntax error: empty
> declaration" on these two lines.
>

Doh.

This patch LGTM. I've applied this upstream as well and it will be in the
next python-zstandard release. The canonical upstream is
https://github.com/indygreg/python-zstandard by the way (although I haven't
pushed the fix there yet).


>
> diff --git a/contrib/python-zstandard/c-ext/compressionparams.c
> b/contrib/python-zstandard/c-ext/compressionparams.c
> --- a/contrib/python-zstandard/c-ext/compressionparams.c
> +++ b/contrib/python-zstandard/c-ext/compressionparams.c
> @@ -136,7 +136,7 @@ static void CompressionParameters_deallo
>
>  static Py_ssize_t CompressionParameters_length(PyObject* self) {
>         return 7;
> -};
> +}
>
>  static PyObject* CompressionParameters_item(PyObject* o, Py_ssize_t i) {
>         CompressionParametersObject* self = (CompressionParametersObject*)
> o;
> diff --git a/contrib/python-zstandard/c-ext/dictparams.c
> b/contrib/python-zstandard/c-ext/dictparams.c
> --- a/contrib/python-zstandard/c-ext/dictparams.c
> +++ b/contrib/python-zstandard/c-ext/dictparams.c
> @@ -42,7 +42,7 @@ static void DictParameters_dealloc(PyObj
>
>  static Py_ssize_t DictParameters_length(PyObject* self) {
>         return 4;
> -};
> +}
>
>  static PyObject* DictParameters_item(PyObject* o, Py_ssize_t i) {
>         DictParametersObject* self = (DictParametersObject*)o;
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20161122/ef1aed4f/attachment.html>


More information about the Mercurial-devel mailing list