The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/python/funcptr/.cvsignore

@@ -0,0 +1,9 @@
+*_wrap.c
+*_wrap.cxx
+*.dll
+*.dsw
+*.ncb
+*.opt
+*.plg
+Release
+Debug

Examples/python/funcptr/Makefile

@@ -13,6 +13,7 @@ static::
 	TARGET='mypython' INTERFACE='$(INTERFACE)' python_static
 
 clean::
-	rm -f *_wrap* *.o *~ *.so mypython *.pyc .~* core
+	$(MAKE) -f $(TOP)/Makefile python_clean
+	rm -f $(TARGET).py
 
 check: all

Examples/python/funcptr/example.c

@@ -15,3 +15,5 @@ int sub(int a, int b) {
 int mul(int a, int b) {
   return a*b;
 }
+
+int (*funcvar)(int,int) = add;

Examples/python/funcptr/example.i

@@ -8,8 +8,9 @@
 extern int  do_op(int a, int b, int (*op)(int, int));
 
 /* Now install a bunch of "ops" as constants */
-%constant(int (*)(int,int)) ADD = add;
-%constant(int (*)(int,int)) SUB = sub;
-%constant(int (*)(int,int)) MUL = mul;
+%constant int (*ADD)(int,int) = add;
+%constant int (*SUB)(int,int) = sub;
+%constant int (*MUL)(int,int) = mul;
 
+extern int (*funcvar)(int,int);