Attachment #118560 for bug #143894

Lines 149-157 Link Here

(-)mahogany-0.67.cvs/include/Mcommon.h (-3 / +3 lines)
149	*/	149	*/
150	# define PY_CALLBACKVA(arg,default) PythonCallback arg	150	# define PY_CALLBACKVA(arg,default) PythonCallback arg
151	#else	151	#else
152	# define PY_CALLBACK(name, profile, default) PythonCallback((int)default)	152	# define PY_CALLBACK(name, profile, default) PythonCallback((long)default)
153	inline int PythonCallback(int def) { return def; }	153	inline long PythonCallback(long def) { return def; }
154	# define PY_CALLBACKVA(arg,default) PythonCallback((int)default)	154	# define PY_CALLBACKVA(arg,default) PythonCallback((long)default)
155	#endif	155	#endif
156	//@}	156	//@}
157		157

Lines 131-136 Link Here

(-)mahogany-0.67.cvs/include/MPython.h (+2 lines)
131	M_PY_VAR_DECL(PyTypeObject *, PyInstance_Type);	131	M_PY_VAR_DECL(PyTypeObject *, PyInstance_Type);
132		132
133	// ints and longs	133	// ints and longs
		134	M_PY_WRAPPER_DECL(PyObject *, PyBool_FromLong, (long));
134	M_PY_WRAPPER_DECL(long, PyInt_AsLong, (PyObject *));	135	M_PY_WRAPPER_DECL(long, PyInt_AsLong, (PyObject *));
135	M_PY_WRAPPER_DECL(PyObject*, PyInt_FromLong, (long));	136	M_PY_WRAPPER_DECL(PyObject*, PyInt_FromLong, (long));
136	M_PY_WRAPPER_DECL(PyObject *, PyLong_FromUnsignedLong, (unsigned long));	137	M_PY_WRAPPER_DECL(PyObject *, PyLong_FromUnsignedLong, (unsigned long));
Lines 278-283 Link Here
278	#define PyInstance_Type (*M_PyInstance_Type)	279	#define PyInstance_Type (*M_PyInstance_Type)
279		280
280	// ints and longs	281	// ints and longs
		282	#define PyBool_FromLong M_PyBool_FromLong
281	#define PyInt_AsLong M_PyInt_AsLong	283	#define PyInt_AsLong M_PyInt_AsLong
282	#define PyInt_FromLong M_PyInt_FromLong	284	#define PyInt_FromLong M_PyInt_FromLong
283	#define PyLong_FromUnsignedLong M_PyLong_FromUnsignedLong	285	#define PyLong_FromUnsignedLong M_PyLong_FromUnsignedLong

Lines 2454-2460 Link Here

(-)mahogany-0.67.cvs/src/classes/MessageView.cpp (-1 / +1 lines)
2454	CHECK( !cidOrig.empty(), false, "empty CID not allowed" );	2454	CHECK( !cidOrig.empty(), false, "empty CID not allowed" );
2455		2455
2456	String cid;	2456	String cid;
2457	if ( cidOrig.begin() == '<' && cidOrig.rbegin() == '>' )	2457	if ( *cidOrig.begin() == '<' && cidOrig.length() == '>' )
2458	cid.assign(cidOrig, 1, cidOrig.length() - 2);	2458	cid.assign(cidOrig, 1, cidOrig.length() - 2);
2459	else	2459	else
2460	cid = cidOrig;	2460	cid = cidOrig;

Lines 109-114 Link Here

(-)mahogany-0.67.cvs/src/Python/PythonDll.cpp (+2 lines)
109	M_PY_VAR_DEF(PyInstance_Type);	109	M_PY_VAR_DEF(PyInstance_Type);
110		110
111	// ints and longs	111	// ints and longs
		112	M_PY_WRAPPER_DEF(PyBool_FromLong);
112	M_PY_WRAPPER_DEF(PyInt_AsLong);	113	M_PY_WRAPPER_DEF(PyInt_AsLong);
113	M_PY_WRAPPER_DEF(PyInt_FromLong);	114	M_PY_WRAPPER_DEF(PyInt_FromLong);
114	M_PY_WRAPPER_DEF(PyLong_FromUnsignedLong);	115	M_PY_WRAPPER_DEF(PyLong_FromUnsignedLong);
Lines 270-275 Link Here
270	PYTHON_SYMBOL(_PyInstance_Lookup)	271	PYTHON_SYMBOL(_PyInstance_Lookup)
271		272
272	// ints and longs	273	// ints and longs
		274	PYTHON_SYMBOL(PyBool_FromLong)
273	PYTHON_SYMBOL(PyInt_AsLong)	275	PYTHON_SYMBOL(PyInt_AsLong)
274	PYTHON_SYMBOL(PyInt_FromLong)	276	PYTHON_SYMBOL(PyInt_FromLong)
275	PYTHON_SYMBOL(PyLong_FromUnsignedLong)	277	PYTHON_SYMBOL(PyLong_FromUnsignedLong)

Return to bug 143894