diff options
author | bustico | 2011-01-24 13:39:15 +0000 |
---|---|---|
committer | bustico | 2011-01-24 13:39:15 +0000 |
commit | 7d534bbf798a4036dd3cee1c36df05b2c34defe8 (patch) | |
tree | 4618cc39a3ca54b0f1849bd11a86ea46c169dbc0 /src/ivychannel.h | |
parent | 7cd9cd6f68f0d49d0504966141d70c4324bc73ff (diff) | |
download | ivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.zip ivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.tar.gz ivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.tar.bz2 ivy-c-7d534bbf798a4036dd3cee1c36df05b2c34defe8.tar.xz |
make ivy-c c++ compiler compliant
use last version (1.9.3) of uthash header
Diffstat (limited to 'src/ivychannel.h')
-rw-r--r-- | src/ivychannel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ivychannel.h b/src/ivychannel.h index cc579b8..801fa25 100644 --- a/src/ivychannel.h +++ b/src/ivychannel.h @@ -25,17 +25,17 @@ extern "C" { #ifdef WIN32 #include <windows.h> -#define HANDLE SOCKET +#define IVY_HANDLE SOCKET #else -#define HANDLE int +#define IVY_HANDLE int #endif typedef struct _channel *Channel; /* callback declenche par la gestion de boucle sur evenement exception sur le canal */ typedef void (*ChannelHandleDelete)( void *data ); /* callback declenche par la gestion de boucle sur donnees pretes sur le canal */ -typedef void (*ChannelHandleRead)( Channel channel, HANDLE fd, void *data); -typedef void (*ChannelHandleWrite)( Channel channel, HANDLE fd, void *data); +typedef void (*ChannelHandleRead)( Channel channel, IVY_HANDLE fd, void *data); +typedef void (*ChannelHandleWrite)( Channel channel, IVY_HANDLE fd, void *data); /* fonction appele par le bus pour initialisation */ extern void IvyChannelInit(void); @@ -44,11 +44,11 @@ extern void IvyChannelStop (void); /* fonction appele par le bus pour mise en place des callback sur le canal */ extern Channel IvyChannelAdd( - HANDLE fd, + IVY_HANDLE fd, void *data, ChannelHandleDelete handle_delete, ChannelHandleRead handle_read, - ChannelHandleRead handle_write + ChannelHandleWrite handle_write ); /* fonction appele par le bus pour suppression des callback sur le canal */ |