don't make wxBitmapButtons same size as all the other buttons

[wxWidgets.git] / src / unix / gsocket.c

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 81d56e818fd4f1cdce4a11f4b535c6d77cf78f11..0da32b61eb9741d64628d705b87af43a80b9bc57 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -25,7 +25,8 @@
 
 #ifdef __VMS__
 #include <socket.h>
 
 #ifdef __VMS__
 #include <socket.h>

-struct sockaddr_un {
+struct sockaddr_un
+{

     u_char  sun_len;        /* sockaddr len including null */
     u_char  sun_family;     /* AF_UNIX */
     char    sun_path[108];  /* path name (gag) */
     u_char  sun_len;        /* sockaddr len including null */
     u_char  sun_family;     /* AF_UNIX */
     char    sun_path[108];  /* path name (gag) */


@@ -122,9 +123,9 @@ struct sockaddr_un {
 
 /* Global initialisers */
 
 
 /* Global initialisers */
 

-bool GSocket_Init(void)
+int GSocket_Init(void)

 {
 {

-  return TRUE;
+  return 1;

 }
 
 void GSocket_Cleanup(void)
 }
 
 void GSocket_Cleanup(void)


@@ -350,7 +351,6 @@ GAddress *GSocket_GetPeer(GSocket *socket)
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {
  */
 GSocketError GSocket_SetServer(GSocket *sck)
 {

-  int type;

   int arg = 1;
 
   assert(sck != NULL);
   int arg = 1;
 
   assert(sck != NULL);


@@ -895,7 +895,7 @@ GSocketEventFlags GSocket_Select(GSocket *socket, GSocketEventFlags flags)
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */
  *  Sets the socket to non-blocking mode. All IO calls will return
  *  immediately.
  */

-void GSocket_SetNonBlocking(GSocket *socket, bool non_block)
+void GSocket_SetNonBlocking(GSocket *socket, int non_block)

 {
   assert(socket != NULL);
 
 {
   assert(socket != NULL);
 


@@ -1499,7 +1499,9 @@ GSocketError GAddress_INET_SetPortName(GAddress *address, const char *port,
   se = getservbyname(port, protocol);
   if (!se)
   {
   se = getservbyname(port, protocol);
   if (!se)
   {

-    if (isdigit(port[0]))
+    /* the cast to int suppresses compiler warnings about subscript having the
+       type char */
+    if (isdigit((int)port[0]))

     {
       int port_int;
 
     {
       int port_int;