From 02ef59aeb79b9031dfecde7cb932fa8b63404837 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 5 Feb 2005 22:39:40 +0000 Subject: [PATCH] configure.in (G_LIBS_EXTRA) I think we can include and link 2005-02-05 Tor Lillqvist * configure.in (G_LIBS_EXTRA) * glib/giowin32.c: I think we can include and link with -lws2_32. Only Windows 95 originally didn't have Winsock 2, and it's available as an update for it. Not that we use any actual Winsock 2 -only features, but still, simpler to link directly with ws2_32.dll instead of going through wsock32.dll. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ configure.in | 2 +- glib/giowin32.c | 2 +- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3335df9..8b02add 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-02-05 Tor Lillqvist + * configure.in (G_LIBS_EXTRA) + * glib/giowin32.c: I think we can include and link + with -lws2_32. Only Windows 95 originally didn't have Winsock 2, + and it's available as an update for it. Not that we use any actual + Winsock 2 -only features, but still, simpler to link directly with + ws2_32.dll instead of going through wsock32.dll. + * glib/gfileutils.c (g_file_get_contents): In the Win32 ABI stability version, call g_file_get_contents_utf8(), not itself. (#166386) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3335df9..8b02add 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2005-02-05 Tor Lillqvist + * configure.in (G_LIBS_EXTRA) + * glib/giowin32.c: I think we can include and link + with -lws2_32. Only Windows 95 originally didn't have Winsock 2, + and it's available as an update for it. Not that we use any actual + Winsock 2 -only features, but still, simpler to link directly with + ws2_32.dll instead of going through wsock32.dll. + * glib/gfileutils.c (g_file_get_contents): In the Win32 ABI stability version, call g_file_get_contents_utf8(), not itself. (#166386) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3335df9..8b02add 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,12 @@ 2005-02-05 Tor Lillqvist + * configure.in (G_LIBS_EXTRA) + * glib/giowin32.c: I think we can include and link + with -lws2_32. Only Windows 95 originally didn't have Winsock 2, + and it's available as an update for it. Not that we use any actual + Winsock 2 -only features, but still, simpler to link directly with + ws2_32.dll instead of going through wsock32.dll. + * glib/gfileutils.c (g_file_get_contents): In the Win32 ABI stability version, call g_file_get_contents_utf8(), not itself. (#166386) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3335df9..8b02add 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,12 @@ 2005-02-05 Tor Lillqvist + * configure.in (G_LIBS_EXTRA) + * glib/giowin32.c: I think we can include and link + with -lws2_32. Only Windows 95 originally didn't have Winsock 2, + and it's available as an update for it. Not that we use any actual + Winsock 2 -only features, but still, simpler to link directly with + ws2_32.dll instead of going through wsock32.dll. + * glib/gfileutils.c (g_file_get_contents): In the Win32 ABI stability version, call g_file_get_contents_utf8(), not itself. (#166386) diff --git a/configure.in b/configure.in index e9a7d95..3804f66 100644 --- a/configure.in +++ b/configure.in @@ -2011,7 +2011,7 @@ case $host in G_LIBS_EXTRA="-luser32 -lkernel32" ;; *-*-mingw*) - G_LIBS_EXTRA="-lwsock32 -lole32" + G_LIBS_EXTRA="-lws2_32 -lole32" ;; *) G_LIBS_EXTRA="" diff --git a/glib/giowin32.c b/glib/giowin32.c index 72fe44e..7c98682 100644 --- a/glib/giowin32.c +++ b/glib/giowin32.c @@ -39,7 +39,7 @@ #include #include -#include /* Not everybody has winsock2 */ +#include #include #include #include -- 2.7.4