Merge with 3.2 (Issue #12404).

diff --cc Misc/NEWS
index 4e4b47c7c06938a0df53a95e3bbcf2678e3143f5,9dfd0aca2fd8078585f964a23ca381aebcca5389..6786cad716a7d203e2c5275ad81d088931633b45
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -200,9 -25,9 +200,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12404: Remove C89 incompatible code from mmap module. Patch by Akira
+   Kitada.
+ 
 +- Issue #1874: email now detects and reports as a defect the presence of
 +  any CTE other than 7bit, 8bit, or binary on a multipart.
 +
  - Issue #12383: Fix subprocess module with env={}: don't copy the environment
    variables, start with an empty environment.
  

diff --cc Modules/mmapmodule.c
Simple merge