Further wxUniv fixes

[wxWidgets.git] / include / wx / gsocket.h

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 7ec123fd4d79e191ec4fda85652cdf181bce455f..5f6924aed3f7d0a70cea3e123f637e8fb2e7f94c 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -1,7 +1,7 @@
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket)
  * Name:    gsocket.h
 /* -------------------------------------------------------------------------
  * Project: GSocket (Generic Socket)
  * Name:    gsocket.h

- * Author:  Guilhem Lavaux  
+ * Author:  Guilhem Lavaux

  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket include file (system independent)
  * CVSID:   $Id$
  *          Guillermo Rodriguez Garcia <guille@iies.es> (maintainer)
  * Purpose: GSocket include file (system independent)
  * CVSID:   $Id$


@@ -18,7 +18,9 @@
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>
 #if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
 
 #include <stddef.h>

+#ifndef __WXMAC__

 #include <sys/types.h>
 #include <sys/types.h>

+#endif

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -124,11 +126,11 @@ GAddress *GSocket_GetPeer(GSocket *socket);
  *  Sets up this socket as a server. The local address must have been
  *  set with GSocket_SetLocal() before GSocket_SetServer() is called.
  *  Returns GSOCK_NOERROR on success, one of the following otherwise:
  *  Sets up this socket as a server. The local address must have been
  *  set with GSocket_SetLocal() before GSocket_SetServer() is called.
  *  Returns GSOCK_NOERROR on success, one of the following otherwise:

- * 
+ *

  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.
  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.

- *    GSOCK_IOERR   - low-level error. 
+ *    GSOCK_IOERR   - low-level error.

  */
 GSocketError GSocket_SetServer(GSocket *socket);
 
  */
 GSocketError GSocket_SetServer(GSocket *socket);
 


@@ -142,7 +144,7 @@ GSocketError GSocket_SetServer(GSocket *socket);
  *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
  *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_TIMEDOUT   - timeout, no incoming connections.
  *    GSOCK_WOULDBLOCK - the call would block and the socket is nonblocking.
  *    GSOCK_MEMERR     - couldn't allocate memory.

- *    GSOCK_IOERR      - low-level error. 
+ *    GSOCK_IOERR      - low-level error.

  */
 GSocket *GSocket_WaitConnection(GSocket *socket);
 
  */
 GSocket *GSocket_WaitConnection(GSocket *socket);
 


@@ -170,7 +172,7 @@ GSocket *GSocket_WaitConnection(GSocket *socket);
  *    GSOCK_TIMEDOUT   - timeout, the connection failed.
  *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
  *    GSOCK_MEMERR     - couldn't allocate memory.
  *    GSOCK_TIMEDOUT   - timeout, the connection failed.
  *    GSOCK_WOULDBLOCK - connection in progress (nonblocking sockets only)
  *    GSOCK_MEMERR     - couldn't allocate memory.

- *    GSOCK_IOERR      - low-level error. 
+ *    GSOCK_IOERR      - low-level error.

  */
 GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream);
 
  */
 GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream);
 


@@ -186,7 +188,7 @@ GSocketError GSocket_Connect(GSocket *socket, GSocketStream stream);
  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.
  *  Error codes:
  *    GSOCK_INVSOCK - the socket is in use.
  *    GSOCK_INVADDR - the local address has not been set.

- *    GSOCK_IOERR   - low-level error. 
+ *    GSOCK_IOERR   - low-level error.

  */
 GSocketError GSocket_SetNonOriented(GSocket *socket);
 
  */
 GSocketError GSocket_SetNonOriented(GSocket *socket);
 


@@ -241,7 +243,7 @@ GSocketError GSocket_GetError(GSocket *socket);
  *   operation, there is still data available, the callback function will
  *   be called again.
  * GSOCK_OUTPUT:
  *   operation, there is still data available, the callback function will
  *   be called again.
  * GSOCK_OUTPUT:

- *   The socket is available for writing. That is, the next write call 
+ *   The socket is available for writing. That is, the next write call

  *   won't block. This event is generated only once, when the connection is
  *   first established, and then only if a call failed with GSOCK_WOULDBLOCK,
  *   when the output buffer empties again. This means that the app should
  *   won't block. This event is generated only once, when the connection is
  *   first established, and then only if a call failed with GSOCK_WOULDBLOCK,
  *   when the output buffer empties again. This means that the app should