SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro

diff --git a/Include/import.h b/Include/import.h
index a4e5c0e69f4e016a5a9c3f17a3faa189a09c8814..414e059a3ecfe8a9146eef6ce1c49457b19dc965 100644 (file)
--- 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 de0977d91bf08b685c90d40194e5fc70162bf5e3..872563d5cd9a440687e4791dbb1331f7089591be 100644 (file)
--- 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?
 ================================