[svn] Use high-resolution timers on Windows.

[wget] / src / mswindows.h

diff --git a/src/mswindows.h b/src/mswindows.h
index 652d6f0ef51a5ed721edd8c24a952d5faaf8fefa..6750934b2c6b1221246180a7f051da743daf1a83 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -84,10 +84,10 @@ so, delete this exception statement from your version.  */
 typedef __int64 wgint;
 #define SIZEOF_WGINT 8
 
-#if defined(_MSC_VER) || defined (__WATCOMC__)
-# define WGINT_MAX 9223372036854775807I64
+#ifdef __GNUC__
+#define WGINT_MAX 9223372036854775807LL
 #else
-# define WGINT_MAX 9223372036854775807LL
+#define WGINT_MAX 9223372036854775807I64
 #endif
 
 #define str_to_wgint str_to_int64
@@ -99,39 +99,68 @@ __int64 str_to_int64 (const char *, char **, int);
 /* Transparently support large files, in spirit similar to the POSIX
    LFS API.  */
 #define stat(fname, buf) _stati64 (fname, buf)
-#define fstat(fd, buf) _fstati64(fd, buf)
-#define struct_stat struct _stati64
 
-#define PATH_SEPARATOR '\\'
+#ifndef __BORLANDC__
+# define fstat(fd, buf) _fstati64 (fd, buf)
+#endif
 
-/* Microsoft says stat is _stat, Borland doesn't.  */
-#ifdef _MSC_VER
-# define stat _stat
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# define struct_stat struct _stati64
+#elif defined(__BORLANDC__)
+# define struct_stat struct stati64
+#else
+# define struct_stat struct stat
 #endif
 
+#define PATH_SEPARATOR '\\'
+
 #ifdef HAVE_ISATTY
-/* Microsoft VC supports _isatty; Borland?  */
 #ifdef _MSC_VER
 # define isatty _isatty
 #endif
 #endif
 
-/* If ftello is unavailable, use an approximation. */
-#ifndef HAVE_FTELLO
-__int64 wget_ftello (FILE *);
-# define ftello wget_ftello
-# define HAVE_FTELLO
-#endif
-
 /* #### Do we need this?  */
 #include <direct.h>
 
 /* Windows compilers accept only one arg to mkdir.  */
-#ifndef __BORLANDC__
-# define mkdir(a, b) _mkdir(a)
-#else  /* __BORLANDC__ */
-# define mkdir(a, b) mkdir(a)
-#endif /* __BORLANDC__ */
+#define mkdir(a, b) _mkdir(a)
+
+#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 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_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:  */
 
@@ -173,26 +202,16 @@ __int64 wget_ftello (FILE *);
 
 /* 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 (const char *);
 void ws_percenttitle (double);
 char *ws_mypath (void);
-void windows_main_junk (int *, char **, char **);
+void windows_main (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);
+# ifndef HAVE_INET_NTOP
+extern const char *inet_ntop (int af, const void *src, char *dst, size_t size);
 # endif
 #endif /* ENABLE_IPV6 */