(Merge 3.3) Issue #19932: Fix typo in import.h, missing whitespaces in function proto...

diff --cc Include/import.h
index 4a515d5b6be9f7ea26f5c8545796405ec7343350,73c86ee400f0e3562fe2204cbddfe82bcfad6e39..afdfac2a938f1e4807b0f0a08165e4e7ed5659c3
--- 1/Include/import.h
--- 2/Include/import.h
+++ b/Include/import.h
@@@ -86,18 -86,18 +86,18 @@@ PyAPI_FUNC(int) _PyImport_ReleaseLock(v
  
  PyAPI_FUNC(void) _PyImport_ReInitLock(void);
  
- PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin(
+ PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin(
      const char *name            /* UTF-8 encoded string */
      );
- PyAPI_FUNC(PyObject *)_PyImport_FindExtensionObject(PyObject *, PyObject *);
- PyAPI_FUNC(int)_PyImport_FixupBuiltin(
+ PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *);
+ PyAPI_FUNC(int) _PyImport_FixupBuiltin(
      PyObject *mod,
 -    char *name                  /* UTF-8 encoded string */
 +    const char *name            /* UTF-8 encoded string */
      );
- PyAPI_FUNC(int)_PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
+ PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *);
  
  struct _inittab {
 -    char *name;                 /* ASCII encoded string */
 +    const char *name;           /* ASCII encoded string */
      PyObject* (*initfunc)(void);
  };
  PyAPI_DATA(struct _inittab *) PyImport_Inittab;

diff --cc Misc/NEWS
index 6bd277cf8cce1c2c22fd3e5e3f33248b85bcddfe,c0c543a73ab98ff603155a62eaa9f700cc050ac2..eab79a9cf3485ad3c3ef586081943bceba12406f
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -10,8 +10,11 @@@ Release date: 2014-01-0
  Core and Builtins
  -----------------
  
+ - Issue #19932: Fix typo in import.h, missing whitespaces in function prototypes.
+ 
 +- Issue #19736: Add module-level statvfs constants defined for GNU/glibc
 +  based systems.
 +
  - Issue #19729: In str.format(), fix recursive expansion in format spec.
  
  - Issue #19638: Fix possible crash / undefined behaviour from huge (more than 2