Download as
Browse Code »

Commit 5701e043c3f6c1a7927dafb4b3c268ff49d23522

Authored by perry.werneck@gmail.com
1 parent f5279b60
Exists in master and in 1 other branch develop

Retirando warnings ao compilar para win64

Showing 1 changed file with 27 additions and 10 deletions   Show diff stats
@@ -44,14 +44,16 @@ @@ -44,14 +44,16 @@
44 #include "../globals.h" 44 #include "../globals.h"
45 45
46 static int static_CallAndWait(int(*callback)(H3270 *session, void *), H3270 *session, void *parm); 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 static void static_RemoveSource(void *id); 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 static void * static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session)); 54 static void * static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session));
  55 +#endif // WIN32
  56 +
55 static void * static_AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session)); 57 static void * static_AddTimeOut(unsigned long interval_ms, H3270 *session, void (*proc)(H3270 *session));
56 static void static_RemoveTimeOut(void * timer); 58 static void static_RemoveTimeOut(void * timer);
57 static int static_Sleep(int seconds); 59 static int static_Sleep(int seconds);
@@ -69,7 +71,11 @@ static gboolean IO_closure(gpointer data); @@ -69,7 +71,11 @@ static gboolean IO_closure(gpointer data);
69 { 71 {
70 GSource gsrc; 72 GSource gsrc;
71 GPollFD poll; 73 GPollFD poll;
  74 +#if defined(_WIN32)
  75 + HANDLE source;
  76 +#else
72 int source; 77 int source;
  78 +#endif // WIN32
73 void (*fn)(H3270 *session); 79 void (*fn)(H3270 *session);
74 H3270 *session; 80 H3270 *session;
75 } IO_Source; 81 } IO_Source;
@@ -93,13 +99,17 @@ static gboolean IO_closure(gpointer data); @@ -93,13 +99,17 @@ static gboolean IO_closure(gpointer data);
93 99
94 /*---[ Implement ]-----------------------------------------------------------------------------------------*/ 100 /*---[ Implement ]-----------------------------------------------------------------------------------------*/
95 101
  102 +#ifdef WIN32
  103 +static void * AddSource(HANDLE source, H3270 *session, gushort events, void (*fn)(H3270 *session))
  104 +#else
96 static void * AddSource(int source, H3270 *session, gushort events, void (*fn)(H3270 *session)) 105 static void * AddSource(int source, H3270 *session, gushort events, void (*fn)(H3270 *session))
  106 +#endif // WIN32
97 { 107 {
98 IO_Source *src = (IO_Source *) g_source_new(&IOSources,sizeof(IO_Source)); 108 IO_Source *src = (IO_Source *) g_source_new(&IOSources,sizeof(IO_Source));
99 109
100 src->source = source; 110 src->source = source;
101 src->fn = fn; 111 src->fn = fn;
102 - src->poll.fd = source; 112 + src->poll.fd = (int) source;
103 src->poll.events = events; 113 src->poll.events = events;
104 114
105 g_source_attach((GSource *) src,NULL); 115 g_source_attach((GSource *) src,NULL);
@@ -108,7 +118,11 @@ static void * AddSource(int source, H3270 *session, gushort events, void (*fn)(H @@ -108,7 +118,11 @@ static void * AddSource(int source, H3270 *session, gushort events, void (*fn)(H
108 return src; 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 static void * static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session)) 124 static void * static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session))
  125 +#endif // WIN32
112 { 126 {
113 return AddSource(source,session,G_IO_IN|G_IO_HUP|G_IO_ERR,fn); 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,14 +133,17 @@ static void static_RemoveSource(void *id)
119 g_source_destroy((GSource *) id); 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 return 0; 139 return 0;
  140 +}
126 #else 141 #else
  142 +static void * static_AddExcept(int source, H3270 *session, void (*fn)(H3270 *session))
  143 +{
127 return AddSource(source,session,G_IO_HUP|G_IO_ERR,fn); 144 return AddSource(source,session,G_IO_HUP|G_IO_ERR,fn);
128 -#endif  
129 } 145 }
  146 +#endif // WIN32
130 147
131 static gboolean do_timer(TIMER *t) 148 static gboolean do_timer(TIMER *t)
132 { 149 {
@@ -182,7 +199,7 @@ static gboolean IO_check(GSource *source) @@ -182,7 +199,7 @@ static gboolean IO_check(GSource *source)
182 */ 199 */
183 #if defined(_WIN32) /*[*/ 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 return TRUE; 203 return TRUE;
187 204
188 #else /*][*/ 205 #else /*][*/