[svn] Update the license to include the OpenSSL exception.

[wget] / windows / config.h.ms

diff --git a/windows/config.h.ms b/windows/config.h.ms
index 6d7471102fde08dea5cef7e2ff7abfae838c9f94..27aba5874fadc6227e6b52c4dc45e86450cf8413 100644 (file)
--- a/windows/config.h.ms
+++ b/windows/config.h.ms
@@ -13,38 +13,40 @@
 
    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.  */
+   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 CONFIG_H
 #define CONFIG_H
 
+/* MS Visual C does not define __STDC__ when the MSC extensions are
+   enabled, but you need those extensions to compile <windows.h>.  */
+#if !defined(__STDC__) && defined(_MSC_EXTENSIONS)
+# define __STDC__ 1
+#endif
+
+/* Setting __STDC__ causes MSVC to break other stuff... */
+#if __STDC__ && defined(_MSC_VER)
+# define utimbuf _utimbuf
+# define O_RDONLY _O_RDONLY
+# define alloca _alloca
+#endif
+
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 
-/* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# if HAVE_ALLOCA_H
-#  include <alloca.h>
-# else
-#  ifdef _AIX
- #pragma alloca
-#  else
-#   ifndef alloca /* predefined by HP cc +Olibcalls */
+/* Microsoft and Watcom libraries have an alloca function. */
 char *alloca ();
-#   endif
-#  endif
-# endif
-#endif
-
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
 
 /* Define to empty if the keyword does not work.  */
 /* #undef const */
@@ -186,5 +188,8 @@ char *alloca ();
 #define inline __inline
 #define ftruncate chsize
 
+/* Define if you have the isatty function.  */
+#define HAVE_ISATTY 1
+
 #endif /* CONFIG_H */