X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=msdos%2Fconfig.h;h=db73984597d615dae2b66b227ee552621aaf2e89;hp=f43ab4ece1ba67a22b6535a4c4764c558f1f15d2;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=e7d78dd2a75d0ea21a63ac4968df6079b8018cd5

diff --git a/msdos/config.h b/msdos/config.h
index f43ab4ec..db739845 100644
--- a/msdos/config.h
+++ b/msdos/config.h
@@ -1,5 +1,6 @@
 /* Configuration header file for MS-DOS/Watt-32
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+   Inc.
 
    This file is part of GNU Wget.
 
@@ -16,15 +17,16 @@
    You should have received a copy of the GNU General Public License
    along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-   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 CONFIG_DOS_H
@@ -41,47 +43,43 @@
 
 #include <sys/errno.h>
 
-#if defined(__WATCOMC__) && (__WATCOMC__ >= 1250)  /* OW 1.5+ */
+#if defined(__WATCOMC__)
+  #if (__WATCOMC__ >= 1250)  /* OW 1.5+ */
   #define OPENWATCOM_15
+  #endif
+  #if (__WATCOMC__ >= 1270)  /* OW 1.7+ */
+    #define OPENWATCOM_17
+  #endif
 #endif
 
 #if defined(__HIGHC__)
-  #define inline
   #define HAVE_UNISTD_H 1
   #define HAVE_UTIME_H 1
 #endif
 
-#if defined(__WATCOMC__) || defined(__BORLANDC__)
+#if defined(__WATCOMC__) || defined(__BORLANDC__) || defined(__HIGHC__)
   #define inline
 #endif
 
-#ifdef HAVE_SSL
-  #define OPENSSL_NO_KRB5
-#endif
-
-#define STDC_HEADERS 1
-#define RETSIGTYPE void
-
 #define USE_OPIE 1
 #define USE_DIGEST 1
 #define DEBUG
 
 #ifdef __DJGPP__
-  #define HAVE_STRUCT_UTIMBUF 1
-  #define HAVE_UNAME 1
-  #define HAVE_UTIME_H 1
+  #define HAVE__BOOL          1
   #define HAVE_STRCASECMP 1
   #define HAVE_STRNCASECMP 1
-  #define HAVE_SYS_SELECT_H 1
-  #define HAVE_USLEEP 1
-  #define HAVE_SIGNAL 1
-  #define HAVE_BASENAME 1
   #define HAVE_SIGSETJMP 1
   #define HAVE_SIGBLOCK 1
-  #define HAVE__BOOL 1
+  #define HAVE_STRUCT_UTIMBUF 1
+  #define HAVE_SYS_SELECT_H   1
+  #define HAVE_USLEEP         1
+  #define HAVE_UTIME_H        1
+  #define HAVE_INT64_T        1
 
   #if (DJGPP_MINOR >= 4)
-    #include <stdbool.h>
+    #define HAVE_STDBOOL_H 1
+    #define HAVE_STDINT_H  1
     #define HAVE_SNPRINTF 1
     #define HAVE_VSNPRINTF 1
     #define HAVE_UINT32_T 1
@@ -94,32 +92,26 @@
 #endif
 
 #ifdef OPENWATCOM_15
-  #define HAVE_STRCASECMP
-  #define HAVE_STRNCASECMP
+  #define HAVE_ALLOCA_H    1
+  #define HAVE_INT64_T     1
+  #define HAVE_SNPRINTF    1
+  #define HAVE_STRCASECMP  1
+  #define HAVE_STRNCASECMP 1
+  #define HAVE_STDINT_H    1
+  #define HAVE_UTIME_H     1
+#endif
+
+#ifdef OPENWATCOM_17
+  #define HAVE__BOOL       1
+  #define HAVE_STDBOOL_H   1
 #endif
 
-#define HAVE_GETHOSTBYNAME 1
-#define HAVE_GETHOSTNAME 1
-#define HAVE_SELECT 1
+#define HAVE_PROCESS_H     1
 #define HAVE_STRDUP 1
-#define HAVE_STRERROR 1
-#define HAVE_STRSTR 1
-#define HAVE_MKTIME 1
-#define HAVE_STDARG_H 1
 #define HAVE_STDLIB_H 1
 #define HAVE_STRING_H 1
-#define HAVE_SIGNAL_H 1
-#define HAVE_GETTIMEOFDAY 1
-#define HAVE_MD5 1
 #define HAVE_BUILTIN_MD5 1
 #define HAVE_ISATTY 1
-#define HAVE_MEMMOVE 1
-
-#define OS_TYPE "DOS"
-#define CTRLBREAK_BACKGND 1
-#define PROTOTYPES 1
-
-#define WGET_USE_STDARG
 
 #define lookup_host  wget_lookuphost
 #define select       select_s
@@ -129,15 +121,21 @@
 #define sock_write   wget_sock_write
 #define sock_close   wget_sock_close
 
-#if defined(__DJGPP__)
-  #define MKDIR(p,a) mkdir(p,a)
-#else
+#if !defined(__DJGPP__)
+  #include <direct.h>
+  #define mkdir(p,a)  (mkdir)(p)
   #define strcasecmp stricmp
-  #define MKDIR(p,a) mkdir(p)
 #endif
 
 #if !defined(MSDOS)
-#define MSDOS
+  #define MSDOS
+#endif
+
+#if !defined(USE_WATT32)
+  #define USE_WATT32
 #endif
 
+#define LOCALEDIR ""
+#define OS_TYPE "DOS"
+
 #endif  /* CONFIG_DOS_H */