diff options
| author | fcolin | 2005-07-26 17:08:42 +0000 |
|---|---|---|
| committer | fcolin | 2005-07-26 17:08:42 +0000 |
| commit | 0ca33f5bf0d079dbe61cee5a86b7ba720deef766 (patch) | |
| tree | 90f923a693a5c1d85b3d889b8e2acc760ee8c9a6 /src/ivychannel.h | |
| parent | eadd80325fe2f74a0eedf88b68cc43b2bcb0c915 (diff) | |
| download | ivy-c-0ca33f5bf0d079dbe61cee5a86b7ba720deef766.zip ivy-c-0ca33f5bf0d079dbe61cee5a86b7ba720deef766.tar.gz ivy-c-0ca33f5bf0d079dbe61cee5a86b7ba720deef766.tar.bz2 ivy-c-0ca33f5bf0d079dbe61cee5a86b7ba720deef766.tar.xz | |
Compile Windows remove HANDLE macro conflict
make ivyprobe like Unix version with stdin thread reading
Diffstat (limited to 'src/ivychannel.h')
| -rw-r--r-- | src/ivychannel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ivychannel.h b/src/ivychannel.h index b2c3eb2..fe1d2c7 100644 --- a/src/ivychannel.h +++ b/src/ivychannel.h @@ -25,16 +25,16 @@ 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 (*ChannelHandleRead)( Channel channel, IVY_HANDLE fd, void *data); /* fonction appele par le bus pour initialisation */ extern void IvyChannelInit(void); @@ -43,7 +43,7 @@ extern void IvyChannelStop(void); /* fonction appele par le bus pour mise en place des callback sur le canal */ extern Channel IvyChannelOpen( - HANDLE fd, + IVY_HANDLE fd, void *data, ChannelHandleDelete handle_delete, ChannelHandleRead handle_read |