Fixed stupid new bugs :-(
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -4,6 +4,9 @@
|
|||||||
* Purpose: GSocket main Unix file
|
* Purpose: GSocket main Unix file
|
||||||
* CVSID: $Id$
|
* CVSID: $Id$
|
||||||
* Log: $Log$
|
* Log: $Log$
|
||||||
|
* Log: Revision 1.2 1999/07/23 09:48:31 KB
|
||||||
|
* Log: Fixed stupid new bugs :-(
|
||||||
|
* Log:
|
||||||
* Log: Revision 1.1 1999/07/22 17:51:54 GL
|
* Log: Revision 1.1 1999/07/22 17:51:54 GL
|
||||||
* Log: Added GSocket for Unix (only GTK for the moment)
|
* Log: Added GSocket for Unix (only GTK for the moment)
|
||||||
* Log: Updated wxSocket to use GSocket API
|
* Log: Updated wxSocket to use GSocket API
|
||||||
@@ -21,13 +24,13 @@
|
|||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/types.h>
|
||||||
#ifdef vms
|
#ifdef vms
|
||||||
#include <socket.h>
|
#include <socket.h>
|
||||||
#else
|
#else
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#endif
|
#endif
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
@@ -47,10 +50,14 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
#include <wx/setup.h>
|
||||||
#include <wx/gsocket.h>
|
#include <wx/gsocket.h>
|
||||||
#include "gsockunx.h"
|
#include "gsockunx.h"
|
||||||
|
|
||||||
|
#ifndef SOCKLEN_T
|
||||||
|
# define SOCKLEN_T int
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Constructors / Destructors */
|
/* Constructors / Destructors */
|
||||||
|
|
||||||
GSocket *GSocket_new()
|
GSocket *GSocket_new()
|
||||||
@@ -152,7 +159,7 @@ GAddress *GSocket_GetLocal(GSocket *socket)
|
|||||||
{
|
{
|
||||||
GAddress *address;
|
GAddress *address;
|
||||||
struct sockaddr addr;
|
struct sockaddr addr;
|
||||||
socklen_t size;
|
SOCKLEN_T size;
|
||||||
|
|
||||||
assert(socket != NULL);
|
assert(socket != NULL);
|
||||||
|
|
||||||
@@ -717,10 +724,13 @@ void _GAddress_translate_from(GAddress *address, struct sockaddr *addr, int len)
|
|||||||
case AF_UNIX:
|
case AF_UNIX:
|
||||||
address->m_family = GSOCK_UNIX;
|
address->m_family = GSOCK_UNIX;
|
||||||
break;
|
break;
|
||||||
|
#ifdef AF_INET6
|
||||||
case AF_INET6:
|
case AF_INET6:
|
||||||
address->m_family = GSOCK_INET6;
|
address->m_family = GSOCK_INET6;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
|
|
||||||
/* TODO error */
|
/* TODO error */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user