From d6f8629b205843b8f11e8d12dde7ef9e7d7a1c54 Mon Sep 17 00:00:00 2001
From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 19 Aug 2006 04:19:43 +0000
Subject: [PATCH] SF #1542693: Remove semi-colon at end of
 PyImport_ImportModuleEx macro

---
 Include/import.h |  2 +-
 Misc/NEWS        | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Include/import.h b/Include/import.h
index a4e5c0e69f4..414e059a3ec 100644
--- a/Include/import.h
+++ b/Include/import.h
@@ -22,7 +22,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(char *name,
 PyAPI_FUNC(PyObject *) PyImport_ImportModuleEx(
 	char *name, PyObject *globals, PyObject *locals, PyObject *fromlist);
 #define PyImport_ImportModuleEx(n, g, l, f) \
-	PyImport_ImportModuleLevel(n, g, l, f, -1);
+	PyImport_ImportModuleLevel(n, g, l, f, -1)
 
 PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
 PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
diff --git a/Misc/NEWS b/Misc/NEWS
index de0977d91bf..872563d5cd9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -30,6 +30,13 @@ Build
 - Fix OpenSSL debug build process.
 
 
+C API
+-----
+
+- Bug #1542693: remove semi-colon at end of PyImport_ImportModuleEx macro
+  so it can be used as an expression.
+
+
 What's New in Python 2.5 release candidate 1?
 =============================================
 
@@ -193,10 +200,6 @@ C API
   is always 1 (normal) or 0 (if the specified thread wasn't found).
 
 
-Mac
----
-
-
 What's New in Python 2.5 beta 3?
 ================================