From: John L. <wu...@us...> - 2004-10-21 21:54:04
|
Update of /cvsroot/swig/SWIG/Lib/guile In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11001/Lib/guile Modified Files: guile_gh_run.swg guile_scm_run.swg Log Message: - Add SWIG_RUNTIME_VERSION to new type sharing code. This is for future-proof, if the format of swig_type_info ever changes, this number should be incremented - Add SWIG_LINK_RUNTIME and SWIG_STATIC_RUNTIME symbols to python - Convert inline into SWIGINLINE Index: guile_scm_run.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/guile/guile_scm_run.swg,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** guile_scm_run.swg 16 Oct 2004 18:23:49 -0000 1.14 --- guile_scm_run.swg 21 Oct 2004 21:53:52 -0000 1.15 *************** *** 166,170 **** } ! static inline void * SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type, int argnum, int flags, const char *func_name) --- 166,170 ---- } ! static SWIGINLINE void * SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type, int argnum, int flags, const char *func_name) *************** *** 178,182 **** } ! static inline int SWIG_Guile_IsPointerOfType (SCM s, swig_type_info *type) { --- 178,182 ---- } ! static SWIGINLINE int SWIG_Guile_IsPointerOfType (SCM s, swig_type_info *type) { *************** *** 188,193 **** else return 1; } ! ! static inline int SWIG_Guile_IsPointer (SCM s) { --- 188,193 ---- else return 1; } ! ! static SWIGINLINE int SWIG_Guile_IsPointer (SCM s) { *************** *** 331,335 **** } { ! SCM variable = scm_sym2var(scm_str2symbol("swig-type-list-address"), scm_module_lookup_closure(swig_module), SCM_BOOL_T); --- 331,335 ---- } { ! SCM variable = scm_sym2var(scm_str2symbol("swig-type-list-address" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME), scm_module_lookup_closure(swig_module), SCM_BOOL_T); Index: guile_gh_run.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/guile/guile_gh_run.swg,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** guile_gh_run.swg 16 Oct 2004 18:23:49 -0000 1.6 --- guile_gh_run.swg 21 Oct 2004 21:53:52 -0000 1.7 *************** *** 12,15 **** --- 12,25 ---- #include <stdlib.h> + #define SWIG_RUNTIME_VERSION "1" + /* define SWIG_TYPE_TABLE_NAME as "SWIG_TYPE_TABLE" */ + #ifdef SWIG_TYPE_TABLE + #define SWIG_QUOTE_STRING(x) #x + #define SWIG_EXPAND_AND_QUOTE_STRING(x) SWIG_QUOTE_STRING(x) + #define SWIG_TYPE_TABLE_NAME SWIG_EXPAND_AND_QUOTE_STRING(SWIG_TYPE_TABLE) + #else + #define SWIG_TYPE_TABLE_NAME + #endif + #ifdef __cplusplus extern "C" { *************** *** 427,434 **** SCM pointer; ! pointer = gh_lookup("swig_runtime_data_type_pointer"); if (pointer == SCM_UNDEFINED) { pointer = gh_ulong2scm((unsigned long)SwigModule); ! gh_define("swig_runtime_data_type_pointer", pointer); if (SwigModule->swig_tag == 0) { SwigModule->swig_tag = scm_make_smob_type_mfpe((char *) "swig", 0, NULL, NULL, --- 437,444 ---- SCM pointer; ! pointer = gh_lookup("swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME); if (pointer == SCM_UNDEFINED) { pointer = gh_ulong2scm((unsigned long)SwigModule); ! gh_define("swig_runtime_data_type_pointer" SWIG_RUNTIME_VERSION SWIG_TYPE_TABLE_NAME, pointer); if (SwigModule->swig_tag == 0) { SwigModule->swig_tag = scm_make_smob_type_mfpe((char *) "swig", 0, NULL, NULL, |