diff options
author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-10-10 07:26:09 +0100 |
---|---|---|
committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-10-10 07:26:09 +0100 |
commit | bcb7aee0224bb87490ac40080404633eeab42005 (patch) | |
tree | 481b541509ce091fe0543c781b2d77e428b496be /Lib/mzscheme | |
parent | de5e0c8655a2409814211415e086868be94031a8 (diff) | |
parent | 3fcbb40af94f9209c2da4f806db45ef24ad8408b (diff) | |
download | swig-bcb7aee0224bb87490ac40080404633eeab42005.tar.gz |
Merge branch 'master' into gsoc2009-matevz
Conflicts:
Examples/Makefile.in
Examples/guile/Makefile.in
Lib/php/php.swg
Makefile.in
Source/CParse/parser.y
configure.ac
Diffstat (limited to 'Lib/mzscheme')
-rw-r--r-- | Lib/mzscheme/Makefile | 2 | ||||
-rw-r--r-- | Lib/mzscheme/typemaps.i | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/mzscheme/Makefile b/Lib/mzscheme/Makefile index ff66f9efa..17f5feced 100644 --- a/Lib/mzscheme/Makefile +++ b/Lib/mzscheme/Makefile @@ -1,4 +1,4 @@ -co:: +co: co RCS/*.i* RCS/*.swg* diff --git a/Lib/mzscheme/typemaps.i b/Lib/mzscheme/typemaps.i index 026ec9567..9346349bd 100644 --- a/Lib/mzscheme/typemaps.i +++ b/Lib/mzscheme/typemaps.i @@ -287,7 +287,7 @@ REF_MAP(double, SCHEME_REALP, scheme_real_to_double, //%typemap(in) (char *STRING, int LENGTH) { // int temp; -// $1 = ($1_ltype) gh_scm2newstr($input, &temp); +// $1 = ($1_ltype) SWIG_Guile_scm2newstr($input, &temp); // $2 = ($2_ltype) temp; //} |