Retirando warnings ao compilar para win64

perry.werneck@gmail.com
1 parent e8ce1045
Showing 5 changed files with 83 additions and 30 deletions Show diff stats
src/include/lib3270.h
src/lib3270/host.c
src/lib3270/iocalls.c
src/lib3270/utilc.h
src/pw3270/v3270/iocallback.c
@@ -566,10 +566,18 @@
 		void	* (*AddTimeOut)(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
 		void	  (*RemoveTimeOut)(void *timer);
  
+#ifdef WIN32
+		void	* (*AddInput)(HANDLE source, H3270 *session, void (*fn)(H3270 *session));
+#else
 		void	* (*AddInput)(int source, H3270 *session, void (*fn)(H3270 *session));
+#endif // WIN32
 		void	  (*RemoveInput)(void *id);
  
+#ifdef WIN32
+		void 	* (*AddExcept)(HANDLE source, H3270 *session, void (*fn)(H3270 *session));
+#else
 		void 	* (*AddExcept)(int source, H3270 *session, void (*fn)(H3270 *session));
+#endif
  
 		int 			(*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm);
  
@@ -570,8 +570,8 @@ static int do_connect(H3270 *hSession, const char *n)
 	/* Setup socket I/O. */
 //	add_input_calls(hSession,net_input,net_exception);
 #ifdef _WIN32
-	hSession->ns_exception_id	= AddExcept((int) hSession->sockEvent, hSession, net_exception);
-	hSession->ns_read_id		= AddInput((int) hSession->sockEvent, hSession, net_input);
+	hSession->ns_exception_id	= AddExcept(hSession->sockEvent, hSession, net_exception);
+	hSession->ns_read_id		= AddInput(hSession->sockEvent, hSession, net_input);
 #else
 	hSession->ns_exception_id	= AddExcept(hSession->sock, hSession, net_exception);
 	hSession->ns_read_id		= AddInput(hSession->sock, hSession, net_input);
@@ -50,8 +50,13 @@
 static void   internal_remove_timeout(void *timer);
 static void * internal_add_timeout(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
  
-static void * internal_add_input(int source, H3270 *session, void (*fn)(H3270 *session));
-static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *session));
+#ifdef WIN32
+	static void * internal_add_input(HANDLE source, H3270 *session, void (*fn)(H3270 *session));
+	static void * internal_add_except(HANDLE source, H3270 *session, void (*fn)(H3270 *session));
+#else
+	static void * internal_add_input(int source, H3270 *session, void (*fn)(H3270 *session));
+	static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *session));
+#endif // WIN32
  
 static void   internal_remove_input(void *id);
  
@@ -71,14 +76,22 @@ static void	  internal_ring_bell(H3270 *);
  static void	  (*remove_timeout)(void *timer)
 					= internal_remove_timeout;
  
- static void	* (*add_input)(int source, H3270 *session, void (*fn)(H3270 *session))
-					= internal_add_input;
-
  static void	  (*remove_input)(void *id)
 					= internal_remove_input;
  
+#ifdef WIN32
+ static void	* (*add_input)(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
+					= internal_add_input;
+
+ static void 	* (*add_except)(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
+					= internal_add_except;
+#else
+ static void	* (*add_input)(int source, H3270 *session, void (*fn)(H3270 *session))
+					= internal_add_input;
+
  static void 	* (*add_except)(int source, H3270 *session, void (*fn)(H3270 *session))
 					= internal_add_except;
+#endif // WIN32
  
  static int 	  (*callthread)(int(*callback)(H3270 *, void *), H3270 *session, void *parm)
 					= internal_callthread;
@@ -113,7 +126,11 @@ static void	  internal_ring_bell(H3270 *);
 typedef struct input
 {
         struct input *next;
+#if defined(_WIN32)
+        HANDLE source;
+#else
         int source;
+#endif // WIN32
         int condition;
         void (*proc)(H3270 *session);
         H3270 *session;
@@ -239,7 +256,11 @@ static void internal_remove_timeout(void * timer)
  
 /* Input events. */
  
+#ifdef WIN32
+static void * internal_add_input(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
+#else
 static void * internal_add_input(int source, H3270 *session, void (*fn)(H3270 *session))
+#endif // WIN32
 {
 	input_t *ip = (input_t *) lib3270_malloc(sizeof(input_t));
  
@@ -253,16 +274,19 @@ static void * internal_add_input(int source, H3270 *session, void (*fn)(H3270 *s
 	inputs = ip;
 	inputs_changed = True;
  
-	trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
+//	trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
  
 	return ip;
 }
  
-static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *session))
-{
 #if defined(_WIN32)
+static void * internal_add_except(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
+{
 	return 0;
+}
 #else
+static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *session))
+{
 	input_t *ip = (input_t *) lib3270_malloc(sizeof(input_t));
  
 	trace("%s session=%p proc=%p",__FUNCTION__,session,fn);
@@ -278,8 +302,8 @@ static void * internal_add_except(int source, H3270 *session, void (*fn)(H3270 *
 	trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
  
 	return ip;
-#endif
 }
+#endif // WIN32
  
 static void internal_remove_input(void *id)
 {
@@ -348,7 +372,7 @@ static int internal_event_dispatcher(int block)
 		if ((unsigned long)ip->condition & InputReadMask)
 		{
 #if defined(_WIN32)
-			ha[nha++] = (HANDLE) ip->source;
+			ha[nha++] = ip->source;
 #else
 			FD_SET(ip->source, &rfds);
 #endif
@@ -546,13 +570,13 @@ void RemoveTimeOut(void * timer)
 	return remove_timeout(timer);
 }
  
-void * AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
+void * AddInput(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
 {
 	CHECK_SESSION_HANDLE(session);
 	return add_input(source,session,fn);
 }
  
-void * AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
+void * AddExcept(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
 {
 	CHECK_SESSION_HANDLE(session);
 	return add_except(source,session,fn);
@@ -572,11 +596,11 @@ void x_except_on(H3270 *h)
 		RemoveInput(h->ns_read_id);
  
 #ifdef WIN32
-	h->ns_exception_id = AddExcept((int) h->sockEvent, h, net_exception);
+	h->ns_exception_id = AddExcept(h->sockEvent, h, net_exception);
 	h->excepting = 1;
  
 	if(h->reading)
-		h->ns_read_id = AddInput( (int) h->sockEvent, h, net_input);
+		h->ns_read_id = AddInput(h->sockEvent, h, net_input);
 #else
 	h->ns_exception_id = AddExcept(h->sock, h, net_exception);
 	h->excepting = 1;
@@ -36,10 +36,14 @@ LIB3270_INTERNAL char *xs_buffer(const char *fmt, ...) printflike(1, 2);
 LIB3270_INTERNAL void xs_error(const char *fmt, ...) printflike(1, 2);
 LIB3270_INTERNAL void xs_warning(const char *fmt, ...) printflike(1, 2);
  
-LIB3270_INTERNAL void * AddInput(int, H3270 *session, void (*fn)(H3270 *session));
-LIB3270_INTERNAL void * AddExcept(int, H3270 *session, void (*fn)(H3270 *session));
-// LIB3270_INTERNAL void * AddOutput(int, H3270 *session, void (*fn)(H3270 *session));
-LIB3270_INTERNAL void RemoveInput(void *);
+#ifdef WIN32
+	LIB3270_INTERNAL void * AddInput(HANDLE, H3270 *session, void (*fn)(H3270 *session));
+	LIB3270_INTERNAL void * AddExcept(HANDLE, H3270 *session, void (*fn)(H3270 *session));
+#else
+	LIB3270_INTERNAL void * AddInput(int, H3270 *session, void (*fn)(H3270 *session));
+	LIB3270_INTERNAL void * AddExcept(int, H3270 *session, void (*fn)(H3270 *session));
+#endif // WIN32
+LIB3270_INTERNAL void   RemoveInput(void *);
 LIB3270_INTERNAL void * AddTimeOut(unsigned long msec, H3270 *session, void (*fn)(H3270 *session));
 LIB3270_INTERNAL void RemoveTimeOut(void *cookie);
  
@@ -44,14 +44,16 @@
 #include "../globals.h"
  
 static int 				  static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm);
-static void 			* static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session));
 static void				  static_RemoveSource(void *id);
  
-//#if !defined(_WIN32)
-// static void 			* static_AddOutput(int source, H3270 *session, void (*fn)(H3270 *session));
-//#endif
-
+#ifdef WIN32
+static void 			* static_AddInput(HANDLE source, H3270 *session, void (*fn)(H3270 *session));
+static void 			* static_AddExcept(HANDLE source, H3270 *session, void (*fn)(H3270 *session));
+#else
+static void 			* static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session));
 static void 			* static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session));
+#endif // WIN32
+
 static void 			* static_AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
 static void 			  static_RemoveTimeOut(void * timer);
 static int				  static_Sleep(int seconds);
@@ -69,7 +71,11 @@ static gboolean			IO_closure(gpointer data);
  {
 	GSource gsrc;
 	GPollFD	poll;
+#if defined(_WIN32)
+	HANDLE	source;
+#else
 	int		source;
+#endif // WIN32
 	void	(*fn)(H3270 *session);
 	H3270 	*session;
  } IO_Source;
@@ -93,13 +99,17 @@ static gboolean			IO_closure(gpointer data);
  
 /*---[ Implement ]-----------------------------------------------------------------------------------------*/
  
+#ifdef WIN32
+static void * AddSource(HANDLE source, H3270 *session, gushort events, void (*fn)(H3270 *session))
+#else
 static void * AddSource(int source, H3270 *session, gushort events, void (*fn)(H3270 *session))
+#endif // WIN32
 {
 	IO_Source *src = (IO_Source *) g_source_new(&IOSources,sizeof(IO_Source));
  
 	src->source			= source;
 	src->fn				= fn;
-	src->poll.fd		= source;
+	src->poll.fd		= (int) source;
 	src->poll.events	= events;
  
 	g_source_attach((GSource *) src,NULL);
@@ -108,7 +118,11 @@ static void * AddSource(int source, H3270 *session, gushort events, void (*fn)(H
 	return src;
 }
  
+#ifdef WIN32
+static void * static_AddInput(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
+#else
 static void * static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
+#endif // WIN32
 {
 	return AddSource(source,session,G_IO_IN|G_IO_HUP|G_IO_ERR,fn);
 }
@@ -119,14 +133,17 @@ static void static_RemoveSource(void *id)
 		g_source_destroy((GSource *) id);
 }
  
-static void * static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
+#if defined(WIN32)
+static void * static_AddExcept(HANDLE source, H3270 *session, void (*fn)(H3270 *session))
 {
-#if defined(_WIN32) /*[*/
 	return 0;
+}
 #else
+static void * static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
+{
 	return AddSource(source,session,G_IO_HUP|G_IO_ERR,fn);
-#endif
 }
+#endif // WIN32
  
 static gboolean do_timer(TIMER *t)
 {
@@ -182,7 +199,7 @@ static gboolean IO_check(GSource *source)
 	 */
 #if defined(_WIN32) /*[*/
  
-	if(WaitForSingleObject((HANDLE) ((IO_Source *) source)->source,0) == WAIT_OBJECT_0)
+	if(WaitForSingleObject(((IO_Source *) source)->source,0) == WAIT_OBJECT_0)
 		return TRUE;
  
 #else /*][*/
...	...	@@ -566,10 +566,18 @@
566	566	void * (AddTimeOut)(unsigned long interval_ms, H3270 session, void (proc)(H3270 session));
567	567	void (RemoveTimeOut)(void timer);
568	568
	569	+#ifdef WIN32
	570	+ void * (AddInput)(HANDLE source, H3270 session, void (fn)(H3270 session));
	571	+#else
569	572	void * (AddInput)(int source, H3270 session, void (fn)(H3270 session));
	573	+#endif // WIN32
570	574	void (RemoveInput)(void id);
571	575
	576	+#ifdef WIN32
	577	+ void * (AddExcept)(HANDLE source, H3270 session, void (fn)(H3270 session));
	578	+#else
572	579	void * (AddExcept)(int source, H3270 session, void (fn)(H3270 session));
	580	+#endif
573	581
574	582	int (callthread)(int(callback)(H3270 , void ), H3270 session, void parm);
575	583
...	...
...	...	@@ -570,8 +570,8 @@ static int do_connect(H3270 hSession, const char n)
570	570	/* Setup socket I/O. */
571	571	// add_input_calls(hSession,net_input,net_exception);
572	572	#ifdef _WIN32
573		- hSession->ns_exception_id = AddExcept((int) hSession->sockEvent, hSession, net_exception);
574		- hSession->ns_read_id = AddInput((int) hSession->sockEvent, hSession, net_input);
	573	+ hSession->ns_exception_id = AddExcept(hSession->sockEvent, hSession, net_exception);
	574	+ hSession->ns_read_id = AddInput(hSession->sockEvent, hSession, net_input);
575	575	#else
576	576	hSession->ns_exception_id = AddExcept(hSession->sock, hSession, net_exception);
577	577	hSession->ns_read_id = AddInput(hSession->sock, hSession, net_input);
...	...
...	...	@@ -50,8 +50,13 @@
50	50	static void internal_remove_timeout(void *timer);
51	51	static void * internal_add_timeout(unsigned long interval_ms, H3270 session, void (proc)(H3270 *session));
52	52
53		-static void * internal_add_input(int source, H3270 session, void (fn)(H3270 *session));
54		-static void * internal_add_except(int source, H3270 session, void (fn)(H3270 *session));
	53	+#ifdef WIN32
	54	+ static void * internal_add_input(HANDLE source, H3270 session, void (fn)(H3270 *session));
	55	+ static void * internal_add_except(HANDLE source, H3270 session, void (fn)(H3270 *session));
	56	+#else
	57	+ static void * internal_add_input(int source, H3270 session, void (fn)(H3270 *session));
	58	+ static void * internal_add_except(int source, H3270 session, void (fn)(H3270 *session));
	59	+#endif // WIN32
55	60
56	61	static void internal_remove_input(void *id);
57	62
...	...	@@ -71,14 +76,22 @@ static void internal_ring_bell(H3270 *);
71	76	static void (remove_timeout)(void timer)
72	77	= internal_remove_timeout;
73	78
74		- static void * (add_input)(int source, H3270 session, void (fn)(H3270 session))
75		- = internal_add_input;
76		-
77	79	static void (remove_input)(void id)
78	80	= internal_remove_input;
79	81
	82	+#ifdef WIN32
	83	+ static void * (add_input)(HANDLE source, H3270 session, void (fn)(H3270 session))
	84	+ = internal_add_input;
	85	+
	86	+ static void * (add_except)(HANDLE source, H3270 session, void (fn)(H3270 session))
	87	+ = internal_add_except;
	88	+#else
	89	+ static void * (add_input)(int source, H3270 session, void (fn)(H3270 session))
	90	+ = internal_add_input;
	91	+
80	92	static void * (add_except)(int source, H3270 session, void (fn)(H3270 session))
81	93	= internal_add_except;
	94	+#endif // WIN32
82	95
83	96	static int (callthread)(int(callback)(H3270 , void ), H3270 session, void parm)
84	97	= internal_callthread;
...	...	@@ -113,7 +126,11 @@ static void internal_ring_bell(H3270 *);
113	126	typedef struct input
114	127	{
115	128	struct input *next;
	129	+#if defined(_WIN32)
	130	+ HANDLE source;
	131	+#else
116	132	int source;
	133	+#endif // WIN32
117	134	int condition;
118	135	void (proc)(H3270 session);
119	136	H3270 *session;
...	...	@@ -239,7 +256,11 @@ static void internal_remove_timeout(void * timer)
239	256
240	257	/* Input events. */
241	258
	259	+#ifdef WIN32
	260	+static void * internal_add_input(HANDLE source, H3270 session, void (fn)(H3270 *session))
	261	+#else
242	262	static void * internal_add_input(int source, H3270 session, void (fn)(H3270 *session))
	263	+#endif // WIN32
243	264	{
244	265	input_t ip = (input_t ) lib3270_malloc(sizeof(input_t));
245	266
...	...	@@ -253,16 +274,19 @@ static void * internal_add_input(int source, H3270 session, void (fn)(H3270 *s
253	274	inputs = ip;
254	275	inputs_changed = True;
255	276
256		- trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
	277	+// trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
257	278
258	279	return ip;
259	280	}
260	281
261		-static void * internal_add_except(int source, H3270 session, void (fn)(H3270 *session))
262		-{
263	282	#if defined(_WIN32)
	283	+static void * internal_add_except(HANDLE source, H3270 session, void (fn)(H3270 *session))
	284	+{
264	285	return 0;
	286	+}
265	287	#else
	288	+static void * internal_add_except(int source, H3270 session, void (fn)(H3270 *session))
	289	+{
266	290	input_t ip = (input_t ) lib3270_malloc(sizeof(input_t));
267	291
268	292	trace("%s session=%p proc=%p",__FUNCTION__,session,fn);
...	...	@@ -278,8 +302,8 @@ static void * internal_add_except(int source, H3270 session, void (fn)(H3270 *
278	302	trace("%s: fd=%d callback=%p handle=%p",__FUNCTION__,source,fn,ip);
279	303
280	304	return ip;
281		-#endif
282	305	}
	306	+#endif // WIN32
283	307
284	308	static void internal_remove_input(void *id)
285	309	{
...	...	@@ -348,7 +372,7 @@ static int internal_event_dispatcher(int block)
348	372	if ((unsigned long)ip->condition & InputReadMask)
349	373	{
350	374	#if defined(_WIN32)
351		- ha[nha++] = (HANDLE) ip->source;
	375	+ ha[nha++] = ip->source;
352	376	#else
353	377	FD_SET(ip->source, &rfds);
354	378	#endif
...	...	@@ -546,13 +570,13 @@ void RemoveTimeOut(void * timer)
546	570	return remove_timeout(timer);
547	571	}
548	572
549		-void * AddInput(int source, H3270 session, void (fn)(H3270 *session))
	573	+void * AddInput(HANDLE source, H3270 session, void (fn)(H3270 *session))
550	574	{
551	575	CHECK_SESSION_HANDLE(session);
552	576	return add_input(source,session,fn);
553	577	}
554	578
555		-void * AddExcept(int source, H3270 session, void (fn)(H3270 *session))
	579	+void * AddExcept(HANDLE source, H3270 session, void (fn)(H3270 *session))
556	580	{
557	581	CHECK_SESSION_HANDLE(session);
558	582	return add_except(source,session,fn);
...	...	@@ -572,11 +596,11 @@ void x_except_on(H3270 *h)
572	596	RemoveInput(h->ns_read_id);
573	597
574	598	#ifdef WIN32
575		- h->ns_exception_id = AddExcept((int) h->sockEvent, h, net_exception);
	599	+ h->ns_exception_id = AddExcept(h->sockEvent, h, net_exception);
576	600	h->excepting = 1;
577	601
578	602	if(h->reading)
579		- h->ns_read_id = AddInput( (int) h->sockEvent, h, net_input);
	603	+ h->ns_read_id = AddInput(h->sockEvent, h, net_input);
580	604	#else
581	605	h->ns_exception_id = AddExcept(h->sock, h, net_exception);
582	606	h->excepting = 1;
...	...
...	...	@@ -36,10 +36,14 @@ LIB3270_INTERNAL char xs_buffer(const char fmt, ...) printflike(1, 2);
36	36	LIB3270_INTERNAL void xs_error(const char *fmt, ...) printflike(1, 2);
37	37	LIB3270_INTERNAL void xs_warning(const char *fmt, ...) printflike(1, 2);
38	38
39		-LIB3270_INTERNAL void * AddInput(int, H3270 session, void (fn)(H3270 *session));
40		-LIB3270_INTERNAL void * AddExcept(int, H3270 session, void (fn)(H3270 *session));
41		-// LIB3270_INTERNAL void * AddOutput(int, H3270 session, void (fn)(H3270 *session));
42		-LIB3270_INTERNAL void RemoveInput(void *);
	39	+#ifdef WIN32
	40	+ LIB3270_INTERNAL void * AddInput(HANDLE, H3270 session, void (fn)(H3270 *session));
	41	+ LIB3270_INTERNAL void * AddExcept(HANDLE, H3270 session, void (fn)(H3270 *session));
	42	+#else
	43	+ LIB3270_INTERNAL void * AddInput(int, H3270 session, void (fn)(H3270 *session));
	44	+ LIB3270_INTERNAL void * AddExcept(int, H3270 session, void (fn)(H3270 *session));
	45	+#endif // WIN32
	46	+LIB3270_INTERNAL void RemoveInput(void *);
43	47	LIB3270_INTERNAL void * AddTimeOut(unsigned long msec, H3270 session, void (fn)(H3270 *session));
44	48	LIB3270_INTERNAL void RemoveTimeOut(void *cookie);
45	49
...	...
...	...	@@ -44,14 +44,16 @@
44	44	#include "../globals.h"
45	45
46	46	static int static_CallAndWait(int(callback)(H3270 session, void ), H3270 session, void *parm);
47		-static void * static_AddInput(int source, H3270 session, void (fn)(H3270 *session));
48	47	static void static_RemoveSource(void *id);
49	48
50		-//#if !defined(_WIN32)
51		-// static void * static_AddOutput(int source, H3270 session, void (fn)(H3270 *session));
52		-//#endif
53		-
	49	+#ifdef WIN32
	50	+static void * static_AddInput(HANDLE source, H3270 session, void (fn)(H3270 *session));
	51	+static void * static_AddExcept(HANDLE source, H3270 session, void (fn)(H3270 *session));
	52	+#else
	53	+static void * static_AddInput(int source, H3270 session, void (fn)(H3270 *session));
54	54	static void * static_AddExcept(int source, H3270 session, void (fn)(H3270 *session));
	55	+#endif // WIN32
	56	+
55	57	static void * static_AddTimeOut(unsigned long interval_ms, H3270 session, void (proc)(H3270 *session));
56	58	static void static_RemoveTimeOut(void * timer);
57	59	static int static_Sleep(int seconds);
...	...	@@ -69,7 +71,11 @@ static gboolean IO_closure(gpointer data);
69	71	{
70	72	GSource gsrc;
71	73	GPollFD poll;
	74	+#if defined(_WIN32)
	75	+ HANDLE source;
	76	+#else
72	77	int source;
	78	+#endif // WIN32
73	79	void (fn)(H3270 session);
74	80	H3270 *session;
75	81	} IO_Source;
...	...	@@ -93,13 +99,17 @@ static gboolean IO_closure(gpointer data);
93	99
94	100	/---[ Implement ]-----------------------------------------------------------------------------------------/
95	101
	102	+#ifdef WIN32
	103	+static void * AddSource(HANDLE source, H3270 session, gushort events, void (fn)(H3270 *session))
	104	+#else
96	105	static void * AddSource(int source, H3270 session, gushort events, void (fn)(H3270 *session))
	106	+#endif // WIN32
97	107	{
98	108	IO_Source src = (IO_Source ) g_source_new(&IOSources,sizeof(IO_Source));
99	109
100	110	src->source = source;
101	111	src->fn = fn;
102		- src->poll.fd = source;
	112	+ src->poll.fd = (int) source;
103	113	src->poll.events = events;
104	114
105	115	g_source_attach((GSource *) src,NULL);
...	...	@@ -108,7 +118,11 @@ static void * AddSource(int source, H3270 session, gushort events, void (fn)(H
108	118	return src;
109	119	}
110	120
	121	+#ifdef WIN32
	122	+static void * static_AddInput(HANDLE source, H3270 session, void (fn)(H3270 *session))
	123	+#else
111	124	static void * static_AddInput(int source, H3270 session, void (fn)(H3270 *session))
	125	+#endif // WIN32
112	126	{
113	127	return AddSource(source,session,G_IO_IN\|G_IO_HUP\|G_IO_ERR,fn);
114	128	}
...	...	@@ -119,14 +133,17 @@ static void static_RemoveSource(void *id)
119	133	g_source_destroy((GSource *) id);
120	134	}
121	135
122		-static void * static_AddExcept(int source, H3270 session, void (fn)(H3270 *session))
	136	+#if defined(WIN32)
	137	+static void * static_AddExcept(HANDLE source, H3270 session, void (fn)(H3270 *session))
123	138	{
124		-#if defined(_WIN32) /[/
125	139	return 0;
	140	+}
126	141	#else
	142	+static void * static_AddExcept(int source, H3270 session, void (fn)(H3270 *session))
	143	+{
127	144	return AddSource(source,session,G_IO_HUP\|G_IO_ERR,fn);
128		-#endif
129	145	}
	146	+#endif // WIN32
130	147
131	148	static gboolean do_timer(TIMER *t)
132	149	{
...	...	@@ -182,7 +199,7 @@ static gboolean IO_check(GSource *source)
182	199	*/
183	200	#if defined(_WIN32) /[/
184	201
185		- if(WaitForSingleObject((HANDLE) ((IO_Source *) source)->source,0) == WAIT_OBJECT_0)
	202	+ if(WaitForSingleObject(((IO_Source *) source)->source,0) == WAIT_OBJECT_0)
186	203	return TRUE;
187	204
188	205	#else /][/
...	...