[svn] Applied Dennis Smit's --preserve-permissions patch.

[wget] / src / mswindows.h

diff --git a/src/mswindows.h b/src/mswindows.h
index 3c4a76b018c7426f8ff92b17f2c09617d81ccc32..21f4b50f2016f0bd05352b6087cb985af42771b9 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -15,11 +15,52 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+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.  */
 
 #ifndef MSWINDOWS_H
 #define MSWINDOWS_H
 
+#ifndef WGET_H
+#error Include mswindows.h inside or after "wget.h"
+#endif
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN  /* Prevent inclusion of <winsock*.h> in <windows.h> */
+#endif
+
+#include <windows.h>
+
+/* Use the correct winsock header; <ws2tcpip.h> includes <winsock2.h> only on
+ * Watcom/MingW. We cannot use <winsock.h> for IPv6. Using getaddrinfo() requires
+ * <ws2tcpip.h>
+ */
+#if defined(ENABLE_IPV6) || defined(HAVE_GETADDRINFO)
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#else
+# include <winsock.h>
+#endif
+
+#ifndef EAI_SYSTEM
+# define EAI_SYSTEM -1   /* value doesn't matter */
+#endif
+
+/* Must include <sys/stat.h> because of 'stat' define below. */
+#include <sys/stat.h>
+
+/* Missing in several .c files. Include here. */
+#include <io.h>
+
 /* Apparently needed for alloca(). */
 #include <malloc.h>
 
@@ -48,11 +89,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 # define stat _stat
 #endif
 
-#define REALCLOSE(x) closesocket (x)
+#ifdef HAVE_ISATTY
+/* Microsoft VC supports _isatty; Borland ? */
+#ifdef _MSC_VER
+# define isatty _isatty
+#endif
+#endif
 
-/* read & write don't work with sockets on Windows 95.  */
-#define READ(fd, buf, cnt) recv ((fd), (buf), (cnt), 0)
-#define WRITE(fd, buf, cnt) send ((fd), (buf), (cnt), 0)
+#define REALCLOSE(x) closesocket (x)
 
 /* #### Do we need this?  */
 #include <direct.h>
@@ -64,8 +108,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 # define mkdir(a, b) mkdir(a)
 #endif /* __BORLANDC__ */
 
-#include <windows.h>
-
 /* Declarations of various socket errors: */
 
 #define EWOULDBLOCK             WSAEWOULDBLOCK
@@ -106,11 +148,28 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Public functions.  */
 
+#ifndef HAVE_SLEEP
 unsigned int sleep (unsigned);
+#endif
+#ifndef HAVE_USLEEP
+int usleep (unsigned long);
+#endif
+
 void ws_startup (void);
-void ws_changetitle (char*, int);
+void ws_changetitle (const char*, int);
+void ws_percenttitle (double);
 char *ws_mypath (void);
 void ws_help (const char *);
 void windows_main_junk (int *, char **, char **);
 
+/* Things needed for IPv6; missing in <ws2tcpip.h>. */
+#ifdef ENABLE_IPV6
+# ifndef HAVE_NTOP
+  extern const char *inet_ntop (int af, const void *src, char *dst, size_t size);
+# endif
+# ifndef HAVE_PTON
+  extern int inet_pton (int af, const char *src, void *dst);
+# endif
+#endif /* ENABLE_IPV6 */
+
 #endif /* MSWINDOWS_H */