From: Thomas H. <th...@us...> - 2005-04-26 14:44:36
|
Update of /cvsroot/py2exe/py2exe/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1033 Modified Files: run_isapi.c run_ctypes_dll.c Log Message: Use runtime loading of the python dll. Index: run_ctypes_dll.c =================================================================== RCS file: /cvsroot/py2exe/py2exe/source/run_ctypes_dll.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** run_ctypes_dll.c 18 Nov 2004 15:37:33 -0000 1.1 --- run_ctypes_dll.c 26 Apr 2005 14:43:56 -0000 1.2 *************** *** 26,30 **** #include <stdio.h> #include <olectl.h> ! #include <Python.h> // XXX // Function pointers we load from _ctypes.pyd --- 26,32 ---- #include <stdio.h> #include <olectl.h> ! ! #include <assert.h> ! #include "Python-dynload.h" // Function pointers we load from _ctypes.pyd Index: run_isapi.c =================================================================== RCS file: /cvsroot/py2exe/py2exe/source/run_isapi.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** run_isapi.c 6 Sep 2004 23:16:10 -0000 1.1 --- run_isapi.c 26 Apr 2005 14:43:56 -0000 1.2 *************** *** 26,30 **** #include "httpext.h" #include <httpfilt.h> ! #include "Python.h" --- 26,32 ---- #include "httpext.h" #include <httpfilt.h> ! //#include "Python.h" ! #include <stdio.h> ! #include "Python-dynload.h" *************** *** 133,138 **** if (main) { PyObject *name = PyObject_GetAttrString(main, "isapi_module_name"); ! if (name && PyString_Check(name)) ! (*pPyISAPISetOptions)(PyString_AS_STRING(name), TRUE); Py_XDECREF(name); } --- 135,143 ---- if (main) { PyObject *name = PyObject_GetAttrString(main, "isapi_module_name"); ! char *str; ! if (name && (str = PyString_AsString(name))) ! (*pPyISAPISetOptions)(str, TRUE); ! else ! PyErr_Clear(); // In case PyString_AsString fails Py_XDECREF(name); } |