From fc0f1e8147b4d126ccdb930c5f4028a6167fd9ba Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Tue, 23 Sep 2003 21:19:47 +0000 Subject: [PATCH] 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 --- Lib/python/embed.i | 12 ++++++------ Lib/python/embed15.i | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Lib/python/embed.i b/Lib/python/embed.i index 654e24188..4855e3dbb 100644 --- a/Lib/python/embed.i +++ b/Lib/python/embed.i @@ -56,18 +56,18 @@ extern "C" { /* Now define our own version of it. 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; /* Function for adding modules to Python */ static void swig_add_module(char *name, void (*initfunc)()) { - _SwigImport_Inittab[swig_num_modules].name = name; - _SwigImport_Inittab[swig_num_modules].initfunc = initfunc; + SWIG_Import_Inittab[swig_num_modules].name = name; + SWIG_Import_Inittab[swig_num_modules].initfunc = initfunc; swig_num_modules++; - _SwigImport_Inittab[swig_num_modules].name = (char *) 0; - _SwigImport_Inittab[swig_num_modules].initfunc = 0; + SWIG_Import_Inittab[swig_num_modules].name = (char *) 0; + SWIG_Import_Inittab[swig_num_modules].initfunc = 0; } /* Function to add all of Python's build in modules to our interpreter */ @@ -104,7 +104,7 @@ extern struct _inittab *PyImport_Inittab; int main(int argc, char **argv) { swig_add_builtin(); - PyImport_Inittab = _SwigImport_Inittab; + PyImport_Inittab = SWIG_Import_Inittab; return Py_Main(argc,argv); } diff --git a/Lib/python/embed15.i b/Lib/python/embed15.i index 654e24188..4855e3dbb 100644 --- a/Lib/python/embed15.i +++ b/Lib/python/embed15.i @@ -56,18 +56,18 @@ extern "C" { /* Now define our own version of it. 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; /* Function for adding modules to Python */ static void swig_add_module(char *name, void (*initfunc)()) { - _SwigImport_Inittab[swig_num_modules].name = name; - _SwigImport_Inittab[swig_num_modules].initfunc = initfunc; + SWIG_Import_Inittab[swig_num_modules].name = name; + SWIG_Import_Inittab[swig_num_modules].initfunc = initfunc; swig_num_modules++; - _SwigImport_Inittab[swig_num_modules].name = (char *) 0; - _SwigImport_Inittab[swig_num_modules].initfunc = 0; + SWIG_Import_Inittab[swig_num_modules].name = (char *) 0; + SWIG_Import_Inittab[swig_num_modules].initfunc = 0; } /* Function to add all of Python's build in modules to our interpreter */ @@ -104,7 +104,7 @@ extern struct _inittab *PyImport_Inittab; int main(int argc, char **argv) { swig_add_builtin(); - PyImport_Inittab = _SwigImport_Inittab; + PyImport_Inittab = SWIG_Import_Inittab; return Py_Main(argc,argv); }