work around macro definition of fileno breaking our c++ code

diff --git a/src/mod/endpoints/mod_verto/mcast/MCAST.pm b/src/mod/endpoints/mod_verto/mcast/MCAST.pm
index 531665035bfcc0ba20630d1a06b94b137dc1b999..dc2d01f1f7be107b092de63352064c4c3d83f1cc 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/MCAST.pm
+++ b/src/mod/endpoints/mod_verto/mcast/MCAST.pm
@@ -76,7 +76,7 @@ sub DESTROY {
 
 *send = *MCASTc::McastHandle_send;
 *recv = *MCASTc::McastHandle_recv;
-*fileno = *MCASTc::McastHandle_fileno;
+*filenum = *MCASTc::McastHandle_filenum;
 sub DISOWN {
     my $self = shift;
     my $ptr = tied(%$self);

diff --git a/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp b/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp
index 2e3eca6c6d31667c8399bf67d4b7bf2efcc05b4f..879d6e05503e5e0ef25c9b7c581fbc85a865f923 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp
+++ b/src/mod/endpoints/mod_verto/mcast/mcast_cpp.cpp
@@ -63,7 +63,7 @@ char *McastHandle::recv(int ms)
        return NULL;
 }
 
-int McastHandle::fileno(void)
+int McastHandle::filenum(void)
 {
        return handle.sock;
 }

diff --git a/src/mod/endpoints/mod_verto/mcast/mcast_cpp.h b/src/mod/endpoints/mod_verto/mcast/mcast_cpp.h
index 5990871a0ffb4111496844387884020cc4803aa1..bc9e85822d49a3596cb4d6d2190c88cba354b39a 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/mcast_cpp.h
+++ b/src/mod/endpoints/mod_verto/mcast/mcast_cpp.h
@@ -49,7 +49,7 @@ class McastHandle {
        virtual ~McastHandle();
        int send(const char *data);
        char *recv(int ms = 0);
-       int fileno(void);
+       int filenum(void);
 };
 
 #ifdef __cplusplus

diff --git a/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp b/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp
index 77725cf4bdf98c751dd53babf5584f99c04e432c..4a928255354f19e5c8870d902781967959567be7 100644 (file)
--- a/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp
+++ b/src/mod/endpoints/mod_verto/mcast/mcast_wrap.cpp
@@ -1888,7 +1888,7 @@ XS(_wrap_McastHandle_recv) {
 }
 
 
-XS(_wrap_McastHandle_fileno) {
+XS(_wrap_McastHandle_filenum) {
   {
     McastHandle *arg1 = (McastHandle *) 0 ;
     int result;
@@ -1898,14 +1898,14 @@ XS(_wrap_McastHandle_fileno) {
     dXSARGS;
     
     if ((items < 1) || (items > 1)) {
-      SWIG_croak("Usage: McastHandle_fileno(self);");
+      SWIG_croak("Usage: McastHandle_filenum(self);");
     }
     res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_McastHandle, 0 |  0 );
     if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "McastHandle_fileno" "', argument " "1"" of type '" "McastHandle *""'"); 
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "McastHandle_filenum" "', argument " "1"" of type '" "McastHandle *""'"); 
     }
     arg1 = reinterpret_cast< McastHandle * >(argp1);
-    result = (int)(arg1)->fileno();
+    result = (int)(arg1)->filenum();
     ST(argvi) = SWIG_From_int  SWIG_PERL_CALL_ARGS_1(static_cast< int >(result)); argvi++ ;
     
     XSRETURN(argvi);
@@ -1952,7 +1952,7 @@ static swig_command_info swig_commands[] = {
 {"MCASTc::delete_McastHandle", _wrap_delete_McastHandle},
 {"MCASTc::McastHandle_send", _wrap_McastHandle_send},
 {"MCASTc::McastHandle_recv", _wrap_McastHandle_recv},
-{"MCASTc::McastHandle_fileno", _wrap_McastHandle_fileno},
+{"MCASTc::McastHandle_filenum", _wrap_McastHandle_filenum},
 {0,0}
 };
 /* -----------------------------------------------------------------------------