diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-11-03 18:18:31 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-11-03 18:18:31 +0000 |
| commit | f794cb4259412d8850bda788a0d2ade170b6f15b (patch) | |
| tree | 7fea723915a6171c1e2a71a38580da88c1b512d0 | |
| parent | a89315e38e033d9bfab28c8809979c0c7a6234e6 (diff) | |
| download | gdk-pixbuf-f794cb4259412d8850bda788a0d2ade170b6f15b.tar.gz | |
Remove check for winsock.h since it might show up on Linux+Wine. Instead
Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com>
* 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)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | gtk/gtkfilesel.c | 2 |
8 files changed, 43 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com> + + * 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:27:40 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b13470468..37a0f3ec0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com> + + * 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:27:40 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b13470468..37a0f3ec0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com> + + * 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:27:40 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b13470468..37a0f3ec0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com> + + * 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:27:40 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b13470468..37a0f3ec0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com> + + * 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:27:40 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b13470468..37a0f3ec0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Nov 3 13:03:29 2002 Owen Taylor <otaylor@redhat.com> + + * 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:27:40 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_get_size): diff --git a/configure.in b/configure.in index 1bae0ed0e..16073905a 100644 --- a/configure.in +++ b/configure.in @@ -460,7 +460,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 111ec1078..ba1316e7c 100644 --- a/gtk/gtkfilesel.c +++ b/gtk/gtkfilesel.c @@ -51,7 +51,7 @@ #include <windows.h> #undef STRICT #endif /* G_OS_WIN32 || G_WITH_CYGWIN */ -#if defined(HAVE_WINSOCK_H) && !defined(G_WITH_CYGWIN) +#ifdef G_OS_WIN32 #include <winsock.h> /* For gethostname */ #endif |