meta/plugin_graphmultiepg.xml: fix merge conflict

[enigma2.git] / lib / python / swig.h

diff --git a/lib/python/swig.h b/lib/python/swig.h
index da787eeaab1e5f2e91678a1ab99174fdb73484bd..370c6ab5ead63220d46f8e4a0d6f2f237c489477 100644 (file)
--- a/lib/python/swig.h
+++ b/lib/python/swig.h
@@ -5,7 +5,6 @@
 #define SWIG_IGNORE(x) %ignore x
 #define SWIG_EXTEND(x, code) %extend x { code }
 #define SWIG_TEMPLATE_TYPEDEF(x, y) %template(y) x; %typemap_output_ptr(x)
-#define SWIG_TEMPLATE_TYPEDEF_REPLACE(x, y) %template(y##_REPLACE) x; %typemap_output_ptr(x)
 #define SWIG_ALLOW_OUTPUT_SIMPLE(x) %typemap_output_simple(x)
 #define SWIG_INPUT INPUT
 #define SWIG_OUTPUT OUTPUT
@@ -16,7 +15,6 @@
 #define SWIG_IGNORE(x)
 #define SWIG_EXTEND(x, code)
 #define SWIG_TEMPLATE_TYPEDEF(x, y)
-#define SWIG_TEMPLATE_TYPEDEF_REPLACE(x, y)
 #define SWIG_ALLOW_OUTPUT_SIMPLE(x)
 #define SWIG_INPUT
 #define SWIG_OUTPUT