[svn] Fixes to support out of the box compilation on various Windows compilers.

[wget] / src / mswindows.h

diff --git a/src/mswindows.h b/src/mswindows.h
index 03ab6cd23f8c6c84c7ce608ca9c241b3899e00d6..4f505d8002f5ea3700e6b2ea7e9ef416755f4e40 100644 (file)
--- a/src/mswindows.h
+++ b/src/mswindows.h
@@ -1,25 +1,38 @@
 /* Declarations for windows
    Copyright (C) 1995, 1997, 1997, 1998 Free Software Foundation, Inc.
 
-This file is part of Wget.
+This file is part of GNU Wget.
 
-This program is free software; you can redistribute it and/or modify
+GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
 (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+along with Wget; if not, write to the Free Software
+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
 
+/* Apparently needed for alloca(). */
+#include <malloc.h>
+
 #ifndef S_ISDIR
 # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
 #endif
@@ -45,6 +58,17 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 # define stat _stat
 #endif
 
+#ifdef HAVE_ISATTY
+/* Microsoft VC supports _isatty; Borland ? */
+#ifdef _MSC_VER
+# define isatty _isatty
+#endif
+#endif
+
+/* Use ANSI-style stdargs regardless of whether the compiler bothers
+   to define __STDC__.  (Many don't when extensions are enabled.)  */
+#define WGET_USE_STDARG
+
 #define REALCLOSE(x) closesocket (x)
 
 /* read & write don't work with sockets on Windows 95.  */
@@ -101,9 +125,20 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define ESTALE                  WSAESTALE
 #define EREMOTE                 WSAEREMOTE
 
+#ifdef __DMC__
+# define HAVE_SLEEP 1
+# define HAVE_USLEEP 1
+#endif
+
 /* 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);
 char *ws_mypath (void);