glib r7384 - in trunk: . glib

[tml svn gnome org]

Author: tml
Date: Thu Aug 21 11:47:04 2008
New Revision: 7384
URL: http://svn.gnome.org/viewvc/glib?rev=7384&view=rev

Log:
2008-08-21  Tor Lillqvist  <tml novell com>

	* glib/giowin32.c: Don't bother compiling the binary
	compatibility g_io_channel_win32_new_stream_socket()
	function that has not been mentioned in any header since 2.0 on
	Win64.

	* glib/glib.symbols: Mark it, too, private, and don't export it on
	Win64.



Modified:
   trunk/ChangeLog
   trunk/glib/giowin32.c
   trunk/glib/glib.symbols

Modified: trunk/glib/giowin32.c
==============================================================================
--- trunk/glib/giowin32.c	(original)
+++ trunk/glib/giowin32.c	Thu Aug 21 11:47:04 2008
@@ -2131,6 +2131,8 @@
   fd->events = condition;
 }
 
+#ifndef _WIN64
+
 /* Binary compatibility */
 GIOChannel *
 g_io_channel_win32_new_stream_socket (int socket)
@@ -2138,5 +2140,7 @@
   return g_io_channel_win32_new_socket (socket);
 }
 
+#endif
+
 #define __G_IO_WIN32_C__
 #include "galiasdef.c"

Modified: trunk/glib/glib.symbols
==============================================================================
--- trunk/glib/glib.symbols	(original)
+++ trunk/glib/glib.symbols	Thu Aug 21 11:47:04 2008
@@ -501,7 +501,9 @@
 g_io_channel_win32_new_fd
 g_io_channel_win32_new_messages
 g_io_channel_win32_new_socket
-g_io_channel_win32_new_stream_socket
+#ifndef _WIN64
+g_io_channel_win32_new_stream_socket PRIVATE
+#endif
 g_io_channel_win32_poll
 g_io_channel_win32_set_debug
 #endif