From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sat, 19 Aug 2006 04:25:29 +0000 (+0000)
Subject: SF #1542693: Remove semi-colon at end of PyImport_ImportModuleEx macro
X-Git-Tag: v2.6a1~2769
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a26706d75aa51b4b5a412892a99686b21331f72;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Include/import.h b/Include/import.h
index a4e5c0e69f4e..414e059a3ecf 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 069b714361c3..898f002eb578 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,9 @@ Build
 C API
 -----
 
+- Bug #1542693: remove semi-colon at end of PyImport_ImportModuleEx macro
+  so it can be used as an expression.
+
 
 Mac
 ---
@@ -211,10 +214,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?
 ================================