Fix the Win32-only code to use current API,

2000-10-06  Tor Lillqvist  <tml@iki.fi>

	* tests/gio-test.c (main): Fix the Win32-only code to use current
	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().

ChangeLog

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

ChangeLog.pre-2-0

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

ChangeLog.pre-2-10

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

ChangeLog.pre-2-12

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

ChangeLog.pre-2-2

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

ChangeLog.pre-2-4

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

ChangeLog.pre-2-6

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

ChangeLog.pre-2-8

@@ -16,6 +16,9 @@
 	
 	* glib.def: Add new entry point.
 
+	* tests/gio-test.c (main): Fix the Win32-only code to use current
+	API, g_io_channel_win32_make_pollfd() and g_io_channel_win32_poll().
+
 	Fixes from Hans Breuer:
 	
 	* glib.h (struct DIR): Keep the last readdir result cached inside

tests/gio-test.c

@@ -222,6 +222,7 @@ main (int    argc,
       int i;
 #ifdef G_OS_WIN32
       GTimeVal start, end;
+      GPollFD pollfd;
       int pollresult;
 #endif
 
@@ -268,7 +269,8 @@ main (int    argc,
 
 #ifdef G_OS_WIN32
 	  g_get_current_time (&start);
-	  pollresult = g_io_channel_win32_wait_for_condition (my_read_channel, G_IO_IN, 100);
+	  g_io_channel_win32_make_pollfd (my_read_channel, G_IO_IN, &pollfd);
+	  pollresult = g_io_channel_win32_poll (&pollfd, 1, 100);
 	  g_get_current_time (&end);
 	  if (end.tv_usec < start.tv_usec)
 	    end.tv_sec--, end.tv_usec += 1000000;

tests/makefile.msc.in

@@ -19,6 +19,7 @@ TESTS = \
 	array-test.exe	\
 	date-test.exe	\
 	dirname-test.exe\
+	gio-test.exe	\
 	hash-test.exe	\
 	list-test.exe	\
 	node-test.exe	\
@@ -26,6 +27,7 @@ TESTS = \
 	rand-test.exe	\
 	relation-test.exe\
 	slist-test.exe	\
+# strfunc-test doesn't compile with MSVC
 #	strfunc-test.exe\
 	string-test.exe	\
 	thread-test.exe	\