From: Martin v. Löwis <martin@v.loewis.de>
Date: Tue, 4 Apr 2006 07:04:07 +0000 (+0000)
Subject: Disable .DLL as an extension for extension modules.
X-Git-Tag: v2.5a1~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c95dd9488a7ebd5354dad2061e6b9cb608eb82f8;p=thirdparty%2FPython%2Fcpython.git

Disable .DLL as an extension for extension modules.
---

diff --git a/Python/dynload_win.c b/Python/dynload_win.c
index 6e8f822efb18..36746e2f10c2 100644
--- a/Python/dynload_win.c
+++ b/Python/dynload_win.c
@@ -11,10 +11,16 @@
 const struct filedescr _PyImport_DynLoadFiletab[] = {
 #ifdef _DEBUG
 	{"_d.pyd", "rb", C_EXTENSION},
+	/* Temporarily disable .dll, to avoid conflicts between sqlite3.dll
+	   and the sqlite3 package. If this needs to be reverted for 2.5,
+	   some other solution for the naming conflict must be found.
 	{"_d.dll", "rb", C_EXTENSION},
+	*/
 #else
 	{".pyd", "rb", C_EXTENSION},
+	/* Likewise
 	{".dll", "rb", C_EXTENSION},
+	*/
 #endif
 	{0, 0}
 };