projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced SOCKLEN_T by WX_SOCKLEN_T to resolve conflict with AIX system headers.
[wxWidgets.git]
/
src
/
unix
/
gsocket.cpp
diff --git
a/src/unix/gsocket.cpp
b/src/unix/gsocket.cpp
index 3ab997e9b79f6f0a2b605f1fa26edb5451260731..ab459eb018c6f7bc111dca21d7df46a4318a2954 100644
(file)
--- a/
src/unix/gsocket.cpp
+++ b/
src/unix/gsocket.cpp
@@
-114,26
+114,26
@@
int _System soclose(int);
#endif
#include <signal.h>
#endif
#include <signal.h>
-#ifndef SOCKLEN_T
+#ifndef
WX_
SOCKLEN_T
#ifdef VMS
#ifdef VMS
-# define SOCKLEN_T unsigned int
+# define
WX_
SOCKLEN_T unsigned int
#else
# ifdef __GLIBC__
# if __GLIBC__ == 2
#else
# ifdef __GLIBC__
# if __GLIBC__ == 2
-# define SOCKLEN_T socklen_t
+# define
WX_
SOCKLEN_T socklen_t
# endif
# elif defined(__WXMAC__)
# endif
# elif defined(__WXMAC__)
-# define SOCKLEN_T socklen_t
+# define
WX_
SOCKLEN_T socklen_t
# else
# else
-# define SOCKLEN_T int
+# define
WX_
SOCKLEN_T int
# endif
#endif
#endif /* SOCKLEN_T */
#ifndef SOCKOPTLEN_T
# endif
#endif
#endif /* SOCKLEN_T */
#ifndef SOCKOPTLEN_T
-#define SOCKOPTLEN_T SOCKLEN_T
+#define SOCKOPTLEN_T
WX_
SOCKLEN_T
#endif
/*
#endif
/*
@@
-414,7
+414,7
@@
GAddress *GSocket::GetLocal()
{
GAddress *address;
struct sockaddr addr;
{
GAddress *address;
struct sockaddr addr;
- SOCKLEN_T size = sizeof(addr);
+
WX_
SOCKLEN_T size = sizeof(addr);
GSocketError err;
assert(this);
GSocketError err;
assert(this);
@@
-430,7
+430,7
@@
GAddress *GSocket::GetLocal()
return NULL;
}
return NULL;
}
- if (getsockname(m_fd, &addr, (SOCKLEN_T *) &size) < 0)
+ if (getsockname(m_fd, &addr, (
WX_
SOCKLEN_T *) &size) < 0)
{
m_error = GSOCK_IOERR;
return NULL;
{
m_error = GSOCK_IOERR;
return NULL;
@@
-532,7
+532,7
@@
GSocketError GSocket::SetServer()
if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
(getsockname(m_fd,
m_local->m_addr,
if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
(getsockname(m_fd,
m_local->m_addr,
- (SOCKLEN_T *) &m_local->m_len) != 0) ||
+ (
WX_
SOCKLEN_T *) &m_local->m_len) != 0) ||
(listen(m_fd, 5) != 0))
{
Close();
(listen(m_fd, 5) != 0))
{
Close();
@@
-558,7
+558,7
@@
GSocketError GSocket::SetServer()
GSocket *GSocket::WaitConnection()
{
struct sockaddr from;
GSocket *GSocket::WaitConnection()
{
struct sockaddr from;
- SOCKLEN_T fromlen = sizeof(from);
+
WX_
SOCKLEN_T fromlen = sizeof(from);
GSocket *connection;
GSocketError err;
int arg = 1;
GSocket *connection;
GSocketError err;
int arg = 1;
@@
-589,7
+589,7
@@
GSocket *GSocket::WaitConnection()
return NULL;
}
return NULL;
}
- connection->m_fd = accept(m_fd, &from, (SOCKLEN_T *) &fromlen);
+ connection->m_fd = accept(m_fd, &from, (
WX_
SOCKLEN_T *) &fromlen);
/* Reenable CONNECTION events */
Enable(GSOCK_CONNECTION);
/* Reenable CONNECTION events */
Enable(GSOCK_CONNECTION);
@@
-838,7
+838,7
@@
GSocketError GSocket::SetNonOriented()
if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
(getsockname(m_fd,
m_local->m_addr,
if ((bind(m_fd, m_local->m_addr, m_local->m_len) != 0) ||
(getsockname(m_fd,
m_local->m_addr,
- (SOCKLEN_T *) &m_local->m_len) != 0))
+ (
WX_
SOCKLEN_T *) &m_local->m_len) != 0))
{
Close();
m_error = GSOCK_IOERR;
{
Close();
m_error = GSOCK_IOERR;
@@
-1331,7
+1331,7
@@
int GSocket::Recv_Stream(char *buffer, int size)
int GSocket::Recv_Dgram(char *buffer, int size)
{
struct sockaddr from;
int GSocket::Recv_Dgram(char *buffer, int size)
{
struct sockaddr from;
- SOCKLEN_T fromlen = sizeof(from);
+
WX_
SOCKLEN_T fromlen = sizeof(from);
int ret;
GSocketError err;
int ret;
GSocketError err;
@@
-1339,7
+1339,7
@@
int GSocket::Recv_Dgram(char *buffer, int size)
do
{
do
{
- ret = recvfrom(m_fd, buffer, size, 0, &from, (SOCKLEN_T *) &fromlen);
+ ret = recvfrom(m_fd, buffer, size, 0, &from, (
WX_
SOCKLEN_T *) &fromlen);
} while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
if (ret == -1)
} while (ret == -1 && errno == EINTR); /* Loop until not interrupted */
if (ret == -1)