X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fmswindows.h;h=e614d8431f05cdcc671a1f516a70c5834a415c2b;hp=d339bb32e036f456c0dc7b8b82298b06fd834d21;hb=320cfdcb658e8d6556ae9dfd902c2db1db866a6b;hpb=b7c6c35be5930695cc64ef2d54d6f421f8511553
diff --git a/src/mswindows.h b/src/mswindows.h
index d339bb32..e614d843 100644
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,6 +1,7 @@
/* Declarations for windows
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+ Inc.
This file is part of GNU Wget.
@@ -17,15 +18,16 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Wget. If not, see .
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables. You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL". If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version. */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work. */
#ifndef MSWINDOWS_H
#define MSWINDOWS_H
@@ -41,15 +43,8 @@ so, delete this exception statement from your version. */
#include
-/* We need winsock2.h for IPv6 and ws2tcpip.h for getaddrinfo, so
- include both in ENABLE_IPV6 case. (ws2tcpip.h includes winsock2.h
- only on MinGW.) */
-#ifdef ENABLE_IPV6
-# include
-# include
-#else
-# include
-#endif
+#include
+#include
#ifndef EAI_SYSTEM
# define EAI_SYSTEM -1 /* value doesn't matter */
@@ -77,9 +72,7 @@ so, delete this exception statement from your version. */
# define strncasecmp strnicmp
#endif
-/* The same for snprintf() and vsnprintf(). */
-#define snprintf _snprintf
-#define vsnprintf _vsnprintf
+#include
/* Define a wgint type under Windows. */
typedef __int64 wgint;
@@ -111,96 +104,13 @@ typedef __int64 wgint;
#define PATH_SEPARATOR '\\'
-/* Win32 doesn't support the MODE argument to mkdir. */
-#include
-#define mkdir(a, b) (mkdir) (a)
-
/* Additional declarations needed for IPv6: */
#ifdef ENABLE_IPV6
const char *inet_ntop (int, const void *, char *, socklen_t);
#endif
-#ifdef NEED_GAI_STRERROR
-# undef gai_strerror
-# define gai_strerror windows_strerror
-#endif
-
-#ifndef INHIBIT_WRAP
-
-/* Winsock functions don't set errno, so we provide wrappers that do. */
-
-#define socket wrapped_socket
-#define bind wrapped_bind
-#define connect wrapped_connect
-#define listen wrapped_listen
-#define accept wrapped_accept
-#define recv wrapped_recv
-#define send wrapped_send
-#define select wrapped_select
-#define getsockname wrapped_getsockname
-#define getpeername wrapped_getpeername
-#define setsockopt wrapped_setsockopt
-#define closesocket wrapped_closesocket
-
-#endif /* not INHIBIT_WRAP */
-
-int wrapped_socket (int, int, int);
-int wrapped_bind (int, struct sockaddr *, int);
-int wrapped_connect (int, const struct sockaddr *, int);
-int wrapped_listen (int s, int backlog);
-int wrapped_accept (int s, struct sockaddr *a, int *alen);
-int wrapped_recv (int, void *, int, int);
-int wrapped_send (int, const void *, int, int);
-int wrapped_select (int, fd_set *, fd_set *, fd_set *, const struct timeval *);
-int wrapped_getsockname (int, struct sockaddr *, int *);
-int wrapped_getpeername (int, struct sockaddr *, int *);
-int wrapped_setsockopt (int, int, int, const void *, int);
-int wrapped_closesocket (int);
-
-/* Finally, provide a private version of strerror that does the
- right thing with Winsock errors. */
-#ifndef INHIBIT_WRAP
-# define strerror windows_strerror
-#endif
-const char *windows_strerror (int);
-
-/* Declarations of various socket errors: */
-
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#define EINPROGRESS WSAEINPROGRESS
-#define EALREADY WSAEALREADY
-#define ENOTSOCK WSAENOTSOCK
-#define EDESTADDRREQ WSAEDESTADDRREQ
-#define EMSGSIZE WSAEMSGSIZE
-#define EPROTOTYPE WSAEPROTOTYPE
-#define ENOPROTOOPT WSAENOPROTOOPT
-#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#define ESOCKTNOSUPPORT WSAESOCKTNOSUPPORT
-#define EOPNOTSUPP WSAEOPNOTSUPP
-#define EPFNOSUPPORT WSAEPFNOSUPPORT
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#define EADDRINUSE WSAEADDRINUSE
-#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
-#define ENETDOWN WSAENETDOWN
-#define ENETUNREACH WSAENETUNREACH
-#define ENETRESET WSAENETRESET
-#define ECONNABORTED WSAECONNABORTED
-#define ECONNRESET WSAECONNRESET
-#define ENOBUFS WSAENOBUFS
-#define EISCONN WSAEISCONN
-#define ENOTCONN WSAENOTCONN
-#define ESHUTDOWN WSAESHUTDOWN
-#define ETOOMANYREFS WSAETOOMANYREFS
-#define ETIMEDOUT WSAETIMEDOUT
-#define ECONNREFUSED WSAECONNREFUSED
-#define ELOOP WSAELOOP
-#define EHOSTDOWN WSAEHOSTDOWN
-#define EHOSTUNREACH WSAEHOSTUNREACH
-#define EPROCLIM WSAEPROCLIM
-#define EUSERS WSAEUSERS
-#define EDQUOT WSAEDQUOT
-#define ESTALE WSAESTALE
-#define EREMOTE WSAEREMOTE
+/* ioctl needed by set_windows_fd_as_blocking_socket() */
+#include
/* Public functions. */
@@ -209,5 +119,6 @@ void ws_changetitle (const char *);
void ws_percenttitle (double);
char *ws_mypath (void);
void windows_main (char **);
+void set_windows_fd_as_blocking_socket (int);
#endif /* MSWINDOWS_H */