From: Benjamin Peterson Date: Sat, 10 Sep 2016 00:46:24 +0000 (-0700) Subject: fix dummy macro X-Git-Tag: v3.6.0b1~138 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dec2df3df321c3d6bed045d3125564006942b3d9;p=thirdparty%2FPython%2Fcpython.git fix dummy macro --- diff --git a/Include/pydtrace.h b/Include/pydtrace.h index 4c06d0ef79ca..a033772470ee 100644 --- a/Include/pydtrace.h +++ b/Include/pydtrace.h @@ -22,7 +22,7 @@ /* Without DTrace, compile to nothing. */ -#define PyDTrace_LINE(arg0, arg1, arg2, arg3) do ; while (0) +#define PyDTrace_LINE(arg0, arg1, arg2) do ; while (0) #define PyDTrace_FUNCTION_ENTRY(arg0, arg1, arg2) do ; while (0) #define PyDTrace_FUNCTION_RETURN(arg0, arg1, arg2) do ; while (0) #define PyDTrace_GC_START(arg0) do ; while (0) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c index 6597cb7ad576..13c9d2ff4f9e 100644 --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -2841,9 +2841,10 @@ static PyObject *date_getstate(PyDateTime_Date *self); static Py_hash_t date_hash(PyDateTime_Date *self) { - if (self->hashcode == -1) + if (self->hashcode == -1) { self->hashcode = generic_hash( (unsigned char *)self->data, _PyDateTime_DATE_DATASIZE); + } return self->hashcode; }