mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 06:56:14 +01:00
configure.in (G_LIBS_EXTRA) I think we can include <winsock2.h> and link
2005-02-05 Tor Lillqvist <tml@novell.com> * configure.in (G_LIBS_EXTRA) * glib/giowin32.c: I think we can include <winsock2.h> 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.
This commit is contained in:
parent
fc67e936f8
commit
02ef59aeb7
@ -1,5 +1,12 @@
|
|||||||
2005-02-05 Tor Lillqvist <tml@novell.com>
|
2005-02-05 Tor Lillqvist <tml@novell.com>
|
||||||
|
|
||||||
|
* configure.in (G_LIBS_EXTRA)
|
||||||
|
* glib/giowin32.c: I think we can include <winsock2.h> 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
|
* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
|
||||||
stability version, call g_file_get_contents_utf8(), not
|
stability version, call g_file_get_contents_utf8(), not
|
||||||
itself. (#166386)
|
itself. (#166386)
|
||||||
|
@ -1,5 +1,12 @@
|
|||||||
2005-02-05 Tor Lillqvist <tml@novell.com>
|
2005-02-05 Tor Lillqvist <tml@novell.com>
|
||||||
|
|
||||||
|
* configure.in (G_LIBS_EXTRA)
|
||||||
|
* glib/giowin32.c: I think we can include <winsock2.h> 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
|
* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
|
||||||
stability version, call g_file_get_contents_utf8(), not
|
stability version, call g_file_get_contents_utf8(), not
|
||||||
itself. (#166386)
|
itself. (#166386)
|
||||||
|
@ -1,5 +1,12 @@
|
|||||||
2005-02-05 Tor Lillqvist <tml@novell.com>
|
2005-02-05 Tor Lillqvist <tml@novell.com>
|
||||||
|
|
||||||
|
* configure.in (G_LIBS_EXTRA)
|
||||||
|
* glib/giowin32.c: I think we can include <winsock2.h> 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
|
* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
|
||||||
stability version, call g_file_get_contents_utf8(), not
|
stability version, call g_file_get_contents_utf8(), not
|
||||||
itself. (#166386)
|
itself. (#166386)
|
||||||
|
@ -1,5 +1,12 @@
|
|||||||
2005-02-05 Tor Lillqvist <tml@novell.com>
|
2005-02-05 Tor Lillqvist <tml@novell.com>
|
||||||
|
|
||||||
|
* configure.in (G_LIBS_EXTRA)
|
||||||
|
* glib/giowin32.c: I think we can include <winsock2.h> 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
|
* glib/gfileutils.c (g_file_get_contents): In the Win32 ABI
|
||||||
stability version, call g_file_get_contents_utf8(), not
|
stability version, call g_file_get_contents_utf8(), not
|
||||||
itself. (#166386)
|
itself. (#166386)
|
||||||
|
@ -2011,7 +2011,7 @@ case $host in
|
|||||||
G_LIBS_EXTRA="-luser32 -lkernel32"
|
G_LIBS_EXTRA="-luser32 -lkernel32"
|
||||||
;;
|
;;
|
||||||
*-*-mingw*)
|
*-*-mingw*)
|
||||||
G_LIBS_EXTRA="-lwsock32 -lole32"
|
G_LIBS_EXTRA="-lws2_32 -lole32"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
G_LIBS_EXTRA=""
|
G_LIBS_EXTRA=""
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <winsock.h> /* Not everybody has winsock2 */
|
#include <winsock2.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user