From: Martin Panter <vadmium+py@gmail.com>
Date: Fri, 27 May 2016 08:00:24 +0000 (+0000)
Subject: Issue #5784: Merge zlib from 3.5
X-Git-Tag: v3.6.0a2~220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4affb71bcccea880fad00a3d1f2d0e4c622e848;p=thirdparty%2FPython%2Fcpython.git

Issue #5784: Merge zlib from 3.5
---

f4affb71bcccea880fad00a3d1f2d0e4c622e848
diff --cc Modules/clinic/zlibmodule.c.h
index 222cb6779a1c,602ae1df827f..7ca48cb16b08
--- a/Modules/clinic/zlibmodule.c.h
+++ b/Modules/clinic/zlibmodule.c.h
@@@ -440,4 -442,4 +443,4 @@@ exit
  #ifndef ZLIB_COMPRESS_COPY_METHODDEF
      #define ZLIB_COMPRESS_COPY_METHODDEF
  #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */
- /*[clinic end generated code: output=e6f3b79e051ecc35 input=a9049054013a1b77]*/
 -/*[clinic end generated code: output=f31627b314a7bd2f input=a9049054013a1b77]*/
++/*[clinic end generated code: output=8669ba9266c78433 input=a9049054013a1b77]*/