python
diff --git a/‎Misc/NEWS.d/next/Build/2017-11-03-10-07-14.bpo-31926.57wE98.rst‎
Lines changed: 2 additions & 0 deletions b/‎Misc/NEWS.d/next/Build/2017-11-03-10-07-14.bpo-31926.57wE98.rst‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Modules/clinic/zlibmodule.c.h‎
Lines changed: 5 additions & 1 deletion b/‎Modules/clinic/zlibmodule.c.h‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎Modules/zlibmodule.c‎
Lines changed: 0 additions & 4 deletions b/‎Modules/zlibmodule.c‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎Tools/clinic/clinic.py‎
Lines changed: 2 additions & 2 deletions b/‎Tools/clinic/clinic.py‎
Lines changed: 2 additions & 2 deletions
@@ -0,0 +1,2 @@
+Fixed Argument Clinic sometimes causing compilation errors when there was
+more than one function and/or method in a .c file with the same name.
@@ -467,4 +467,8 @@ zlib_crc32(PyObject *module, PyObject *args)
 #ifndef ZLIB_COMPRESS_COPY_METHODDEF
     #define ZLIB_COMPRESS_COPY_METHODDEF
 #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */
-/*[clinic end generated code: output=3a4e2bfe750423a3 input=a9049054013a1b77]*/
+
+#ifndef ZLIB_DECOMPRESS_COPY_METHODDEF
+    #define ZLIB_DECOMPRESS_COPY_METHODDEF
+#endif /* !defined(ZLIB_DECOMPRESS_COPY_METHODDEF) */
+/*[clinic end generated code: output=497dad1132c962e2 input=a9049054013a1b77]*/
@@ -1149,19 +1149,15 @@ static PyMethodDef comp_methods[] =
 {
     ZLIB_COMPRESS_COMPRESS_METHODDEF
     ZLIB_COMPRESS_FLUSH_METHODDEF
-#ifdef HAVE_ZLIB_COPY
     ZLIB_COMPRESS_COPY_METHODDEF
-#endif
     {NULL, NULL}
 };
 
 static PyMethodDef Decomp_methods[] =
 {
     ZLIB_DECOMPRESS_DECOMPRESS_METHODDEF
     ZLIB_DECOMPRESS_FLUSH_METHODDEF
-#ifdef HAVE_ZLIB_COPY
     ZLIB_DECOMPRESS_COPY_METHODDEF
-#endif
     {NULL, NULL}
 };
 
 
@@ -928,8 +928,8 @@ def insert_keywords(s):
             cpp_if = "#if " + conditional
             cpp_endif = "#endif /* " + conditional + " */"
 
-            if methoddef_define and f.name not in clinic.ifndef_symbols:
-                clinic.ifndef_symbols.add(f.name)
+            if methoddef_define and f.full_name not in clinic.ifndef_symbols:
+                clinic.ifndef_symbols.add(f.full_name)
                 methoddef_ifndef = normalize_snippet("""
                     #ifndef {methoddef_name}
                         #define {methoddef_name}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fixed Argument Clinic sometimes causing compilation errors when there was`
	`2`	`+more than one function and/or method in a .c file with the same name.`