rpms/swig
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Make PyCObjects->PyCapsule patch C++ compatible (#627310)

Browse Source 
Signed-off-by: Adam Tkac <atkac@redhat.com>
This commit is contained in:
Adam Tkac 2010-08-27 10:26:57 +02:00
parent b50aa24565
commit 6a30ada4a0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swig.spec
View File

@ -4,7 +4,7 @@
Summary: Connects C/C++/Objective C to some high-level programming languages Summary: Connects C/C++/Objective C to some high-level programming languages
Name: swig Name: swig
Version: 2.0.0 Version: 2.0.0
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv3+ and BSD License: GPLv3+ and BSD
Group: Development/Tools Group: Development/Tools
URL: http://swig.sourceforge.net/ URL: http://swig.sourceforge.net/
@ -115,6 +115,9 @@ rm -rf %{buildroot}
%doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
%changelog %changelog
* Fri Aug 27 2010 Adam Tkac <atkac redhat com> 2.0.0-5
- make PyCObjects->PyCapsule patch C++ compatible (#627310)
* Fri Aug 20 2010 Adam Tkac <atkac redhat com> 2.0.0-4 * Fri Aug 20 2010 Adam Tkac <atkac redhat com> 2.0.0-4
- improve patch for #623854 (PyCObjects->PyCapsule transition) - improve patch for #623854 (PyCObjects->PyCapsule transition)

4
swig200-rh623854.patch
View File

@ -41,7 +41,7 @@ diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.sw
+ size_t i; + size_t i;
+#ifdef USE_CAPSULES +#ifdef USE_CAPSULES
+ swig_module_info *swig_module = + swig_module_info *swig_module =
+ (swig_module_info *) PyCapsule_GetPointer(vptr, TYPE_POINTER_NAME); + (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME);
+#else +#else
swig_module_info *swig_module = (swig_module_info *) vptr; swig_module_info *swig_module = (swig_module_info *) vptr;
+#endif +#endif
@ -56,7 +56,7 @@ diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.sw
#endif #endif
+#ifdef USE_CAPSULES +#ifdef USE_CAPSULES
+ PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME, + PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME,
+ SWIG_Python_DestroyModule); + (PyCapsule_Destructor)SWIG_Python_DestroyModule);
+#else +#else
PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule); PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
+#endif +#endif