getservbyname under INNOTEK gcc needs a (char*), not (const char*) for the protocol...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index f857c3c176107eb621662be1b9eeb355fd3d8410..ea83e5f4f995bdfc188da3216bf218f7d048928b 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -117,7 +117,7 @@ int _System soclose(int);
 #  endif
 #endif
 
 #  endif
 #endif
 

-#else 
+#else

    /* undefine for OSX - its really an int */
 #  ifdef __DARWIN__
 #    undef SOCKLEN_T
    /* undefine for OSX - its really an int */
 #  ifdef __DARWIN__
 #    undef SOCKLEN_T


@@ -1709,7 +1709,11 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
     return GSOCK_INVPORT;
   }
 
     return GSOCK_INVPORT;
   }
 

+#if defined(__WXPM__) && defined(__EMX__)
+  se = getservbyname(port, (char*)protocol);
+#else

   se = getservbyname(port, protocol);
   se = getservbyname(port, protocol);

+#endif

   if (!se)
   {
     /* the cast to int suppresses compiler warnings about subscript having the
   if (!se)
   {
     /* the cast to int suppresses compiler warnings about subscript having the