jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Consistent implementation for disabled languages

Browse source 
The deprecated php4 and php5 use the new Disabled language handling
recently implemented for a consistent implementation
This commit is contained in:
William S Fulton 2019-02-05 19:04:59 +00:00
commit 29d30bd319
2 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/Modules/php.cxx
View file

@ -2861,17 +2861,3 @@ static Language *new_swig_php() {
extern "C" Language *swig_php(void) {
return new_swig_php();
}
extern "C" Language *swig_php4(void) {
Printf(stderr, "*** -php4 is no longer supported.\n"
"*** Either upgrade to PHP5 or use SWIG 1.3.36 or earlier.\n");
SWIG_exit(EXIT_FAILURE);
return NULL; // To avoid compiler warnings.
}
extern "C" Language *swig_php5(void) {
Printf(stderr, "*** -php5 is no longer supported.\n"
"*** Either upgrade to PHP7 or use SWIG < 4.0.0.\n");
SWIG_exit(EXIT_FAILURE);
return NULL; // To avoid compiler warnings.
}

6
Source/Modules/swigmain.cxx
View file

@ -38,8 +38,6 @@ extern "C" {
Language *swig_octave(void);
Language *swig_perl5(void);
Language *swig_php(void);
Language *swig_php4(void);
Language *swig_php5(void);
Language *swig_python(void);
Language *swig_r(void);
Language *swig_ruby(void);
@ -71,8 +69,8 @@ static TargetLanguageModule modules[] = {
{"-perl", swig_perl5, "Perl", Supported},
{"-perl5", swig_perl5, NULL, Supported},
{"-php", swig_php, NULL, Supported},
{"-php4", swig_php4, NULL, Supported},
{"-php5", swig_php5, NULL, Supported},
{"-php4", NULL, "PHP4", Disabled},
{"-php5", NULL, "PHP5", Disabled},
{"-php7", swig_php, "PHP7", Supported},
{"-pike", NULL, "Pike", Disabled},
{"-python", swig_python, "Python", Supported},