Add some missing SWIGINTERN usage

6 files changed, 21 insertions, 11 deletions

diff --git a/Lib/guile/std_common.i b/Lib/guile/std_common.i
index 18c7db089..5899c5548 100644
--- a/Lib/guile/std_common.i
+++ b/Lib/guile/std_common.i
@@ -14,7 +14,8 @@
 %{
 #include <string>
 
-inline std::string SWIG_scm2string(SCM x) {
+SWIGINTERNINLINE
+std::string SWIG_scm2string(SCM x) {
     char* temp;
     temp = SWIG_scm2str(x);
     std::string s(temp);
diff --git a/Lib/mzscheme/std_common.i b/Lib/mzscheme/std_common.i
index 1f1ae1ab7..a83e2731f 100644
--- a/Lib/mzscheme/std_common.i
+++ b/Lib/mzscheme/std_common.i
@@ -11,10 +11,13 @@
 %{
 #include <string>
 
-std::string swig_scm_to_string(Scheme_Object* x) {
+SWIGINTERNINLINE
+std::string swig_scm_to_string(Scheme_Object *x) {
     return std::string(SCHEME_STR_VAL(x));
 }
-Scheme_Object* swig_make_string(const std::string& s) {
+
+SWIGINTERNINLINE
+Scheme_Object *swig_make_string(const std::string &s) {
     return scheme_make_string(s.c_str());
 }
 %}
diff --git a/Lib/ocaml/std_common.i b/Lib/ocaml/std_common.i
index 1c397050c..6523af0b5 100644
--- a/Lib/ocaml/std_common.i
+++ b/Lib/ocaml/std_common.i
@@ -10,10 +10,13 @@
 
 %{
 #include <string>
-    CAML_VALUE SwigString_FromString(const std::string& s) {
-	return caml_val_string((char *)s.c_str());
-    }
-    std::string SwigString_AsString(CAML_VALUE o) {
-	return std::string((char *)caml_ptr_val(o,0));
-    }
+SWIGINTERNINLINE
+CAML_VALUE SwigString_FromString(const std::string &s) {
+  return caml_val_string((char *)s.c_str());
+}
+
+SWIGINTERNINLINE
+std::string SwigString_AsString(CAML_VALUE o) {
+  return std::string((char *)caml_ptr_val(o,0));
+}
 %}
diff --git a/Lib/perl5/std_common.i b/Lib/perl5/std_common.i
index bb280688e..7c1ff2328 100644
--- a/Lib/perl5/std_common.i
+++ b/Lib/perl5/std_common.i
@@ -10,14 +10,17 @@
 
 %fragment("<string>");
 %{
+SWIGINTERN
 double SwigSvToNumber(SV* sv) {
     return SvIOK(sv) ? double(SvIVX(sv)) : SvNVX(sv);
 }
+SWIGINTERN
 std::string SwigSvToString(SV* sv) {
     STRLEN len;
     char *ptr = SvPV(sv, len);
     return std::string(ptr, len);
 }
+SWIGINTERN
 void SwigSvFromString(SV* sv, const std::string& s) {
     sv_setpvn(sv,s.data(),s.size());
 }
diff --git a/Lib/typemaps/string.swg b/Lib/typemaps/string.swg
index 1bf0bd15a..4b7072365 100644
--- a/Lib/typemaps/string.swg
+++ b/Lib/typemaps/string.swg
@@ -18,7 +18,7 @@ SWIG_pchar_descriptor(void)
 }
 
 %fragment("SWIG_strnlen","header",fragment="SWIG_FromCharPtrAndSize") {
-size_t
+SWIGINTERN size_t
 SWIG_strnlen(const char* s, size_t maxlen)
 {
   const char *p;
diff --git a/Lib/typemaps/wstring.swg b/Lib/typemaps/wstring.swg
index 1f2de8221..cd409d1ce 100644
--- a/Lib/typemaps/wstring.swg
+++ b/Lib/typemaps/wstring.swg
@@ -19,7 +19,7 @@ SWIG_pwchar_descriptor()
 }
 
 %fragment("SWIG_wcsnlen","header",fragment="SWIG_FromWCharPtrAndSize") {
-size_t
+SWIGINTERN size_t
 SWIG_wcsnlen(const wchar_t* s, size_t maxlen)
 {
   const wchar_t *p;