OS/2 Statusbar fixes

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

diff --git a/include/wx/gsocket.h b/include/wx/gsocket.h
index 14dc3c609ffa3dc743ef6c09a869f34a1f73ac7c..069a531fc37805ffb5cb04db683ad52c60c7e2b5 100644 (file)
--- a/include/wx/gsocket.h
+++ b/include/wx/gsocket.h
@@ -18,21 +18,10 @@
 #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>

-
-#if !defined(__cplusplus)
-typedef unsigned int bool;
-#endif
-
-#ifndef TRUE
-#define TRUE 1

 #endif
 
 #endif
 

-#ifndef FALSE
-#define FALSE 0
-#endif
-
-

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


@@ -91,15 +80,15 @@ typedef void (*GSocketCallback)(GSocket *socket, GSocketEvent event,
 /* Global initializers */
 
 /* GSocket_Init() must be called at the beginning */
 /* Global initializers */
 
 /* GSocket_Init() must be called at the beginning */

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

 
 /* GSocket_Cleanup() must be called at the end */
 
 /* GSocket_Cleanup() must be called at the end */

-void GSocket_Cleanup();
+void GSocket_Cleanup(void);

 
 
 /* Constructors / Destructors */
 
 
 
 /* Constructors / Destructors */
 

-GSocket *GSocket_new();
+GSocket *GSocket_new(void);

 void GSocket_destroy(GSocket *socket);
 
 
 void GSocket_destroy(GSocket *socket);
 
 


@@ -231,7 +220,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);

 
 /* GSocket_SetTimeout:
  *  Sets the timeout for blocking calls. Time is expressed in
 
 /* GSocket_SetTimeout:
  *  Sets the timeout for blocking calls. Time is expressed in


@@ -289,7 +278,7 @@ void GSocket_UnsetCallback(GSocket *socket, GSocketEventFlags flags);
 
 /* GAddress */
 
 
 /* GAddress */
 

-GAddress *GAddress_new();
+GAddress *GAddress_new(void);

 GAddress *GAddress_copy(GAddress *address);
 void GAddress_destroy(GAddress *address);
 
 GAddress *GAddress_copy(GAddress *address);
 void GAddress_destroy(GAddress *address);