Fixes to comply with with ISO/IEC 14882:1998(E) 17.4.3.1.2 (symbol names):
_SwigImport_Inittab Dave can you double check this doesn't have dire consequences. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@5148 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
61097e184c
commit
fc0f1e8147
2 changed files with 12 additions and 12 deletions
|
|
@ -56,18 +56,18 @@ extern "C" {
|
||||||
/* Now define our own version of it.
|
/* Now define our own version of it.
|
||||||
Hopefully someone does not have more than 1000 built-in modules */
|
Hopefully someone does not have more than 1000 built-in modules */
|
||||||
|
|
||||||
struct _inittab _SwigImport_Inittab[1000];
|
struct _inittab SWIG_Import_Inittab[1000];
|
||||||
|
|
||||||
static int swig_num_modules = 0;
|
static int swig_num_modules = 0;
|
||||||
|
|
||||||
/* Function for adding modules to Python */
|
/* Function for adding modules to Python */
|
||||||
|
|
||||||
static void swig_add_module(char *name, void (*initfunc)()) {
|
static void swig_add_module(char *name, void (*initfunc)()) {
|
||||||
_SwigImport_Inittab[swig_num_modules].name = name;
|
SWIG_Import_Inittab[swig_num_modules].name = name;
|
||||||
_SwigImport_Inittab[swig_num_modules].initfunc = initfunc;
|
SWIG_Import_Inittab[swig_num_modules].initfunc = initfunc;
|
||||||
swig_num_modules++;
|
swig_num_modules++;
|
||||||
_SwigImport_Inittab[swig_num_modules].name = (char *) 0;
|
SWIG_Import_Inittab[swig_num_modules].name = (char *) 0;
|
||||||
_SwigImport_Inittab[swig_num_modules].initfunc = 0;
|
SWIG_Import_Inittab[swig_num_modules].initfunc = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Function to add all of Python's build in modules to our interpreter */
|
/* Function to add all of Python's build in modules to our interpreter */
|
||||||
|
|
@ -104,7 +104,7 @@ extern struct _inittab *PyImport_Inittab;
|
||||||
int
|
int
|
||||||
main(int argc, char **argv) {
|
main(int argc, char **argv) {
|
||||||
swig_add_builtin();
|
swig_add_builtin();
|
||||||
PyImport_Inittab = _SwigImport_Inittab;
|
PyImport_Inittab = SWIG_Import_Inittab;
|
||||||
return Py_Main(argc,argv);
|
return Py_Main(argc,argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -56,18 +56,18 @@ extern "C" {
|
||||||
/* Now define our own version of it.
|
/* Now define our own version of it.
|
||||||
Hopefully someone does not have more than 1000 built-in modules */
|
Hopefully someone does not have more than 1000 built-in modules */
|
||||||
|
|
||||||
struct _inittab _SwigImport_Inittab[1000];
|
struct _inittab SWIG_Import_Inittab[1000];
|
||||||
|
|
||||||
static int swig_num_modules = 0;
|
static int swig_num_modules = 0;
|
||||||
|
|
||||||
/* Function for adding modules to Python */
|
/* Function for adding modules to Python */
|
||||||
|
|
||||||
static void swig_add_module(char *name, void (*initfunc)()) {
|
static void swig_add_module(char *name, void (*initfunc)()) {
|
||||||
_SwigImport_Inittab[swig_num_modules].name = name;
|
SWIG_Import_Inittab[swig_num_modules].name = name;
|
||||||
_SwigImport_Inittab[swig_num_modules].initfunc = initfunc;
|
SWIG_Import_Inittab[swig_num_modules].initfunc = initfunc;
|
||||||
swig_num_modules++;
|
swig_num_modules++;
|
||||||
_SwigImport_Inittab[swig_num_modules].name = (char *) 0;
|
SWIG_Import_Inittab[swig_num_modules].name = (char *) 0;
|
||||||
_SwigImport_Inittab[swig_num_modules].initfunc = 0;
|
SWIG_Import_Inittab[swig_num_modules].initfunc = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Function to add all of Python's build in modules to our interpreter */
|
/* Function to add all of Python's build in modules to our interpreter */
|
||||||
|
|
@ -104,7 +104,7 @@ extern struct _inittab *PyImport_Inittab;
|
||||||
int
|
int
|
||||||
main(int argc, char **argv) {
|
main(int argc, char **argv) {
|
||||||
swig_add_builtin();
|
swig_add_builtin();
|
||||||
PyImport_Inittab = _SwigImport_Inittab;
|
PyImport_Inittab = SWIG_Import_Inittab;
|
||||||
return Py_Main(argc,argv);
|
return Py_Main(argc,argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue