Don't bother compiling the binary compatibility

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.

svn path=/trunk/; revision=7384

diff --git a/ChangeLog b/ChangeLog
index 42927d88afd44975c8e4ea7eee870411f0ec25ae..6aed61c8e23042ce40002371fb948ee57277859b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
 2008-08-21  Tor Lillqvist  <tml@novell.com>
 
        * glib/giowin32.c: Minor comment improvements. Improve run-time
-       warning messages. Drop some #if 0 code.
+       warning messages. Drop some #if 0 code. 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.
 
 2008-08-21  Tor Lillqvist  <tml@novell.com>
 

diff --git a/glib/giowin32.c b/glib/giowin32.c
index 711f5cf88e43fafea5f25563a5282ca4390f3f05..c5a94a311a4b8c7b69b7a23666c4c4f9a0c270df 100644 (file)
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -2131,6 +2131,8 @@ g_io_channel_win32_make_pollfd (GIOChannel   *channel,
   fd->events = condition;
 }
 
+#ifndef _WIN64
+
 /* Binary compatibility */
 GIOChannel *
 g_io_channel_win32_new_stream_socket (int socket)
@@ -2138,5 +2140,7 @@ g_io_channel_win32_new_stream_socket (int socket)
   return g_io_channel_win32_new_socket (socket);
 }
 
+#endif
+
 #define __G_IO_WIN32_C__
 #include "galiasdef.c"

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 73e2ae110587709d86ca33f46d1ce3846fc99d13..06e6ea2ade2e99c8d5d7b89d5c841b1f065f532a 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -501,7 +501,9 @@ g_io_channel_win32_make_pollfd
 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