diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-05-10 14:04:45 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-05-10 14:04:45 +0200 |
| commit | 946fb003e4be2e1485308d7fc5bb7274732751a3 (patch) | |
| tree | 8cc44adc5dc7a7885632c410925e4e6d6c7d332d /lib/python/enigma_python.i | |
| parent | a012dfc95def3f4043f5b0bb319f1f4073592543 (diff) | |
| parent | d245191dd27ad9884c33ad3a76992dc6c4e8f33b (diff) | |
| download | enigma2-946fb003e4be2e1485308d7fc5bb7274732751a3.tar.gz enigma2-946fb003e4be2e1485308d7fc5bb7274732751a3.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
Diffstat (limited to 'lib/python/enigma_python.i')
| -rw-r--r-- | lib/python/enigma_python.i | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/python/enigma_python.i b/lib/python/enigma_python.i index bdf1b144..fe0e71ec 100644 --- a/lib/python/enigma_python.i +++ b/lib/python/enigma_python.i @@ -262,7 +262,10 @@ RESULT SwigFromPython(ePtr<gPixmap> &result, PyObject *obj) res = 0; result = 0; - if (SWIG_Python_ConvertPtr(obj, (void **)&res, SWIGTYPE_p_ePtrTgPixmap_t, SWIG_POINTER_EXCEPTION | 0)) +#ifndef SWIGTYPE_p_ePtrT_gPixmap_t +#define SWIGTYPE_p_ePtrT_gPixmap_t SWIGTYPE_p_ePtrTgPixmap_t +#endif + if (SWIG_Python_ConvertPtr(obj, (void **)&res, SWIGTYPE_p_ePtrT_gPixmap_t, SWIG_POINTER_EXCEPTION | 0)) return -1; if (!res) return -1; @@ -277,7 +280,10 @@ PyObject *New_eServiceReference(const eServiceReference &ref) PyObject *New_iRecordableServicePtr(const ePtr<iRecordableService> &ptr) { ePtr<iRecordableService> *result = new ePtr<iRecordableService>(ptr); - return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_ePtrTiRecordableService_t, 1); +#ifndef SWIGTYPE_p_ePtrT_iRecordableService_t +#define SWIGTYPE_p_ePtrT_iRecordableService_t SWIGTYPE_p_ePtrTiRecordableService_t +#endif + return SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_ePtrT_iRecordableService_t, 1); } %} |