From 82e73cb951b72d91b924452ee44eefb6f135640f Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Wed, 17 Nov 2010 21:20:18 +0000
Subject: [PATCH] Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to
 explicitly zero-initialize all fields, fixing compiler warnings seen when
 building extension modules with gcc with "-Wmissing-field-initializers"
 (implied by "-W")

---
 Include/moduleobject.h | 7 ++++++-
 Misc/NEWS              | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Include/moduleobject.h b/Include/moduleobject.h
index 376a525d1c3..34fa8109326 100644
--- a/Include/moduleobject.h
+++ b/Include/moduleobject.h
@@ -28,7 +28,12 @@ typedef struct PyModuleDef_Base {
   PyObject* m_copy;
 } PyModuleDef_Base;
 
-#define PyModuleDef_HEAD_INIT {PyObject_HEAD_INIT(NULL)}
+#define PyModuleDef_HEAD_INIT { \
+    PyObject_HEAD_INIT(NULL)    \
+    NULL, /* m_init */          \
+    0,    /* m_index */         \
+    NULL, /* m_copy */          \
+  }
 
 typedef struct PyModuleDef{
   PyModuleDef_Base m_base;
diff --git a/Misc/NEWS b/Misc/NEWS
index 43121860673..9f47ca339cb 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,11 @@ What's New in Python 3.2 Beta 1?
 Core and Builtins
 -----------------
 
+- Issue #9518: Extend the PyModuleDef_HEAD_INIT macro to explicitly
+  zero-initialize all fields, fixing compiler warnings seen when building
+  extension modules with gcc with "-Wmissing-field-initializers" (implied
+  by "-W")
+
 Library
 -------