From 42bd8a2a0b840a53863707858f075fe2ec6ceed6 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 3 Nov 2002 18:17:53 +0000 Subject: [PATCH] Remove check for winsock.h since it might show up on Linux+Wine. Instead Sun Nov 3 13:03:29 2002 Owen Taylor * gtk/gtkfilesel.c configure.in: Remove check for winsock.h since it might show up on Linux+Wine. Instead just conditionalize of G_OS_WIN32. (#97396, Gaute Lindkvist) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ configure.in | 1 - gtk/gtkfilesel.c | 2 +- 8 files changed, 43 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cf843a945..f086b4a192 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor + + * gtk/gtkfilesel.c configure.in: Remove check for + winsock.h since it might show up on Linux+Wine. + Instead just conditionalize of G_OS_WIN32. + (#97396, Gaute Lindkvist) + Sun Nov 3 01:39:20 2002 Kristian Rietveld * gtk/gtktreemodel.c (release_row_references): took out the useless diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8cf843a945..f086b4a192 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor + + * gtk/gtkfilesel.c configure.in: Remove check for + winsock.h since it might show up on Linux+Wine. + Instead just conditionalize of G_OS_WIN32. + (#97396, Gaute Lindkvist) + Sun Nov 3 01:39:20 2002 Kristian Rietveld * gtk/gtktreemodel.c (release_row_references): took out the useless diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8cf843a945..f086b4a192 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor + + * gtk/gtkfilesel.c configure.in: Remove check for + winsock.h since it might show up on Linux+Wine. + Instead just conditionalize of G_OS_WIN32. + (#97396, Gaute Lindkvist) + Sun Nov 3 01:39:20 2002 Kristian Rietveld * gtk/gtktreemodel.c (release_row_references): took out the useless diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8cf843a945..f086b4a192 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor + + * gtk/gtkfilesel.c configure.in: Remove check for + winsock.h since it might show up on Linux+Wine. + Instead just conditionalize of G_OS_WIN32. + (#97396, Gaute Lindkvist) + Sun Nov 3 01:39:20 2002 Kristian Rietveld * gtk/gtktreemodel.c (release_row_references): took out the useless diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8cf843a945..f086b4a192 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor + + * gtk/gtkfilesel.c configure.in: Remove check for + winsock.h since it might show up on Linux+Wine. + Instead just conditionalize of G_OS_WIN32. + (#97396, Gaute Lindkvist) + Sun Nov 3 01:39:20 2002 Kristian Rietveld * gtk/gtktreemodel.c (release_row_references): took out the useless diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8cf843a945..f086b4a192 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor + + * gtk/gtkfilesel.c configure.in: Remove check for + winsock.h since it might show up on Linux+Wine. + Instead just conditionalize of G_OS_WIN32. + (#97396, Gaute Lindkvist) + Sun Nov 3 01:39:20 2002 Kristian Rietveld * gtk/gtktreemodel.c (release_row_references): took out the useless diff --git a/configure.in b/configure.in index ca0853bcea..9b2b969747 100644 --- a/configure.in +++ b/configure.in @@ -468,7 +468,6 @@ LIBS=$gtk_save_LIBS AC_CHECK_HEADERS(pwd.h, AC_DEFINE(HAVE_PWD_H)) AC_CHECK_HEADERS(sys/time.h, AC_DEFINE(HAVE_SYS_TIME_H)) AC_CHECK_HEADERS(unistd.h, AC_DEFINE(HAVE_UNISTD_H)) -AC_CHECK_HEADERS(winsock.h, AC_DEFINE(HAVE_WINSOCK_H)) if test "${with_ie55+set}" = set && test $with_ie55 != no; then AC_MSG_CHECKING([for dimm.h]) diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c index 72b5cccfb8..1d17af5e18 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -51,7 +51,7 @@ #include #undef STRICT #endif /* G_OS_WIN32 || G_WITH_CYGWIN */ -#if defined(HAVE_WINSOCK_H) && !defined(G_WITH_CYGWIN) +#ifdef G_OS_WIN32 #include /* For gethostname */ #endif