Don't include <winsock.h> on Cygwin (#91654, Masahiro Sakai).

2002-08-25  Tor Lillqvist  <tml@iki.fi>

	* gtk/gtkfilesel.c: Don't include <winsock.h> on Cygwin (#91654,
	Masahiro Sakai).
This commit is contained in:
Tor Lillqvist 2002-08-25 20:28:47 +00:00 committed by Tor Lillqvist
parent f449238d70
commit 7049e0cb59
7 changed files with 25 additions and 7 deletions

View File

@ -1,9 +1,12 @@
2002-08-25 Tor Lillqvist <tml@iki.fi> 2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c: Don't include <winsock.h> on Cygwin (#91654,
Masahiro Sakai).
* gtk/gtkmain.c: Compile gtk_init_abi_check and * gtk/gtkmain.c: Compile gtk_init_abi_check and
gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on
G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai). G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai).
(check_sizeof_GtkWIndow, check_sizeof_GtkBox): Mention the (check_sizeof_GtkWindow, check_sizeof_GtkBox): Mention the
-mms-bitfields swicth in addition to -fnative-struct. -mms-bitfields swicth in addition to -fnative-struct.
Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org> Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org>

View File

@ -1,9 +1,12 @@
2002-08-25 Tor Lillqvist <tml@iki.fi> 2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c: Don't include <winsock.h> on Cygwin (#91654,
Masahiro Sakai).
* gtk/gtkmain.c: Compile gtk_init_abi_check and * gtk/gtkmain.c: Compile gtk_init_abi_check and
gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on
G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai). G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai).
(check_sizeof_GtkWIndow, check_sizeof_GtkBox): Mention the (check_sizeof_GtkWindow, check_sizeof_GtkBox): Mention the
-mms-bitfields swicth in addition to -fnative-struct. -mms-bitfields swicth in addition to -fnative-struct.
Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org> Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org>

View File

@ -1,9 +1,12 @@
2002-08-25 Tor Lillqvist <tml@iki.fi> 2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c: Don't include <winsock.h> on Cygwin (#91654,
Masahiro Sakai).
* gtk/gtkmain.c: Compile gtk_init_abi_check and * gtk/gtkmain.c: Compile gtk_init_abi_check and
gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on
G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai). G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai).
(check_sizeof_GtkWIndow, check_sizeof_GtkBox): Mention the (check_sizeof_GtkWindow, check_sizeof_GtkBox): Mention the
-mms-bitfields swicth in addition to -fnative-struct. -mms-bitfields swicth in addition to -fnative-struct.
Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org> Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org>

View File

@ -1,9 +1,12 @@
2002-08-25 Tor Lillqvist <tml@iki.fi> 2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c: Don't include <winsock.h> on Cygwin (#91654,
Masahiro Sakai).
* gtk/gtkmain.c: Compile gtk_init_abi_check and * gtk/gtkmain.c: Compile gtk_init_abi_check and
gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on
G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai). G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai).
(check_sizeof_GtkWIndow, check_sizeof_GtkBox): Mention the (check_sizeof_GtkWindow, check_sizeof_GtkBox): Mention the
-mms-bitfields swicth in addition to -fnative-struct. -mms-bitfields swicth in addition to -fnative-struct.
Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org> Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org>

View File

@ -1,9 +1,12 @@
2002-08-25 Tor Lillqvist <tml@iki.fi> 2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c: Don't include <winsock.h> on Cygwin (#91654,
Masahiro Sakai).
* gtk/gtkmain.c: Compile gtk_init_abi_check and * gtk/gtkmain.c: Compile gtk_init_abi_check and
gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on
G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai). G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai).
(check_sizeof_GtkWIndow, check_sizeof_GtkBox): Mention the (check_sizeof_GtkWindow, check_sizeof_GtkBox): Mention the
-mms-bitfields swicth in addition to -fnative-struct. -mms-bitfields swicth in addition to -fnative-struct.
Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org> Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org>

View File

@ -1,9 +1,12 @@
2002-08-25 Tor Lillqvist <tml@iki.fi> 2002-08-25 Tor Lillqvist <tml@iki.fi>
* gtk/gtkfilesel.c: Don't include <winsock.h> on Cygwin (#91654,
Masahiro Sakai).
* gtk/gtkmain.c: Compile gtk_init_abi_check and * gtk/gtkmain.c: Compile gtk_init_abi_check and
gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on gtk_init_check_abi_check when on G_PLATFORM_WIN32, not just on
G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai). G_OS_WIN32, to match gtkmain.h (#91649, Masahiro Sakai).
(check_sizeof_GtkWIndow, check_sizeof_GtkBox): Mention the (check_sizeof_GtkWindow, check_sizeof_GtkBox): Mention the
-mms-bitfields swicth in addition to -fnative-struct. -mms-bitfields swicth in addition to -fnative-struct.
Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org> Sun Aug 25 11:58:27 BST 2002 Tony Gale <gale@gtk.org>

View File

@ -51,7 +51,7 @@
#include <windows.h> #include <windows.h>
#undef STRICT #undef STRICT
#endif /* G_OS_WIN32 || G_WITH_CYGWIN */ #endif /* G_OS_WIN32 || G_WITH_CYGWIN */
#ifdef HAVE_WINSOCK_H #if defined(HAVE_WINSOCK_H) && !defined(G_WITH_CYGWIN)
#include <winsock.h> /* For gethostname */ #include <winsock.h> /* For gethostname */
#endif #endif