From ab926bddda6b56073df227233a54155ea8d0a97f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Wed, 30 Apr 2003 12:38:31 +0200
Subject: [PATCH] Now prefers <winsock2.h> to <winsock.h>.
Rev: src/fd_control.c:1.47
Rev: src/fdlib.h:1.46
Rev: src/time_stuff.h:1.14
---
src/fd_control.c | 8 +++++---
src/fdlib.h | 6 +++++-
src/time_stuff.h | 6 ++++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/fd_control.c b/src/fd_control.c
index 29a7b7dd09..52c9418563 100644
--- a/src/fd_control.c
+++ b/src/fd_control.c
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: fd_control.c,v 1.46 2002/10/11 01:39:31 nilsson Exp $
+|| $Id: fd_control.c,v 1.47 2003/04/30 10:38:31 grubba Exp $
*/
#ifndef TESTING
@@ -10,7 +10,7 @@
#include "pike_error.h"
#include "fdlib.h"
-RCSID("$Id: fd_control.c,v 1.46 2002/10/11 01:39:31 nilsson Exp $");
+RCSID("$Id: fd_control.c,v 1.47 2003/04/30 10:38:31 grubba Exp $");
#else /* TESTING */
@@ -48,7 +48,9 @@ RCSID("$Id: fd_control.c,v 1.46 2002/10/11 01:39:31 nilsson Exp $");
#include <sys/errno.h>
#endif
-#ifdef HAVE_WINSOCK_H
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#elif defined(HAVE_WINSOCK_H)
#include <winsock.h>
#endif
diff --git a/src/fdlib.h b/src/fdlib.h
index a2dee17d83..9531dd5443 100644
--- a/src/fdlib.h
+++ b/src/fdlib.h
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: fdlib.h,v 1.45 2003/03/28 01:25:17 mast Exp $
+|| $Id: fdlib.h,v 1.46 2003/04/30 10:37:36 grubba Exp $
*/
#ifndef FDLIB_H
@@ -55,7 +55,11 @@
#define FD_SETSIZE MAX_OPEN_FILEDESCRIPTORS
#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#include <winbase.h>
typedef int FD;
diff --git a/src/time_stuff.h b/src/time_stuff.h
index ba8893f2fb..b44387773b 100644
--- a/src/time_stuff.h
+++ b/src/time_stuff.h
@@ -2,7 +2,7 @@
|| This file is part of Pike. For copyright information see COPYRIGHT.
|| Pike is distributed under GPL, LGPL and MPL. See the file COPYING
|| for more information.
-|| $Id: time_stuff.h,v 1.13 2003/02/11 19:25:59 mast Exp $
+|| $Id: time_stuff.h,v 1.14 2003/04/30 10:36:47 grubba Exp $
*/
#ifndef TIME_STUFF_H
@@ -25,7 +25,9 @@
# endif
#endif
-#ifdef HAVE_WINSOCK_H
+#ifdef HAVE_WINSOCK2_H
+# include <winsock2.h>
+#elif defined(HAVE_WINSOCK_H)
# include <winsock.h>
#endif
--
GitLab