diff --git a/ChangeLog b/ChangeLog index 740b5cfe..214a60f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-07-07 Hrvoje Niksic + + * configure.bat: Copy the common config.h and config-compiler.h. + 2005-07-06 Hrvoje Niksic * configure.in: Don't check for setjmp.h. diff --git a/configure.bat b/configure.bat index 7b41b8d6..56e20ca7 100755 --- a/configure.bat +++ b/configure.bat @@ -32,7 +32,6 @@ if .%1 == .--msvc goto :msvc goto :usage :msvc -copy windows\config.h.ms src\config.h > nul copy windows\Makefile.top Makefile > nul copy windows\Makefile.src src\Makefile > nul copy windows\Makefile.doc doc\Makefile > nul @@ -43,7 +42,6 @@ echo and then NMAKE. goto :end :borland -copy windows\config.h.bor src\config.h > nul copy windows\Makefile.top.bor Makefile > nul copy windows\Makefile.src.bor src\Makefile > nul copy windows\Makefile.doc doc\Makefile > nul @@ -52,7 +50,6 @@ echo Type MAKE to start compiling. goto :end :mingw -copy windows\config.h.mingw src\config.h > nul copy windows\Makefile.top.mingw Makefile > nul copy windows\Makefile.src.mingw src\Makefile > nul copy windows\Makefile.doc doc\Makefile > nul @@ -63,3 +60,6 @@ goto :end :usage echo "Usage: configure [--borland | --mingw | --msvc]" :end + +copy windows\config.h src\config.h > nul +copy windows\config-compiler.h src\config-compiler.h > nul diff --git a/src/mswindows.c b/src/mswindows.c index d9942347..4c77ab1c 100644 --- a/src/mswindows.c +++ b/src/mswindows.c @@ -36,17 +36,6 @@ so, delete this exception statement from your version. */ #include #include -#ifdef HACK_BCC_UTIME_BUG -# include -# include -# ifdef HAVE_UTIME_H -# include -# endif -# ifdef HAVE_SYS_UTIME_H -# include -# endif -#endif - #define INHIBIT_WRAP /* avoid wrapping of socket, bind, ... */ #include "wget.h" @@ -77,7 +66,7 @@ xsleep (double seconds) sleep (seconds); seconds -= (long) seconds; } - usleep (seconds * 1000000L); + usleep (seconds * 1000000); #else /* not HAVE_USLEEP */ SleepEx ((DWORD) (seconds * 1000 + .5), FALSE); #endif /* not HAVE_USLEEP */ @@ -606,34 +595,6 @@ ws_startup (void) set_sleep_mode (); SetConsoleCtrlHandler (ws_handler, TRUE); } - -/* Replacement utime function for buggy Borland C++Builder 5.5 compiler. - (The Borland utime function only works on Windows NT.) */ - -#ifdef HACK_BCC_UTIME_BUG -int -borland_utime (const char *path, const struct utimbuf *times) -{ - int fd; - int res; - struct ftime ft; - struct tm *ptr_tm; - - if ((fd = open (path, O_RDWR)) < 0) - return -1; - - ptr_tm = localtime (×->modtime); - ft.ft_tsec = ptr_tm->tm_sec >> 1; - ft.ft_min = ptr_tm->tm_min; - ft.ft_hour = ptr_tm->tm_hour; - ft.ft_day = ptr_tm->tm_mday; - ft.ft_month = ptr_tm->tm_mon + 1; - ft.ft_year = ptr_tm->tm_year - 80; - res = setftime (fd, &ft); - close (fd); - return res; -} -#endif /* run_with_timeout Windows implementation. */ diff --git a/src/mswindows.h b/src/mswindows.h index df8e8c2d..948d9839 100644 --- a/src/mswindows.h +++ b/src/mswindows.h @@ -66,9 +66,13 @@ so, delete this exception statement from your version. */ # define S_ISLNK(a) 0 #endif -/* We have strcasecmp and strncasecmp, just under a different name. */ -#define strcasecmp stricmp -#define strncasecmp strnicmp +/* We have strcasecmp and strncasecmp, just under different names. */ +#ifndef HAVE_STRCASECMP +# define strcasecmp stricmp +#endif +#ifndef HAVE_STRNCASECMP +# define strncasecmp strnicmp +#endif /* The same for snprintf() and vsnprintf(). */ #define snprintf _snprintf @@ -77,12 +81,7 @@ so, delete this exception statement from your version. */ /* Define a wgint type under Windows. */ typedef __int64 wgint; #define SIZEOF_WGINT 8 - -#ifdef __GNUC__ -#define WGINT_MAX 9223372036854775807LL -#else -#define WGINT_MAX 9223372036854775807I64 -#endif +#define WGINT_MAX LL (9223372036854775807) /* str_to_wgint is a function with the semantics of strtol, but which works on wgint. Since wgint is unconditionally 64-bit on Windows, @@ -95,52 +94,16 @@ __int64 str_to_int64 (const char *, char **, int); is equivalent to stat anyway. */ #define lstat stat -/* Transparently support statting large files, like POSIX's LFS API - does. All Windows compilers we support use _stati64 (but have - different names for 2nd argument type, see below), so we use - that. */ -#define stat(fname, buf) _stati64 (fname, buf) - -/* On Windows the 64-bit stat requires an explicitly different type - for the 2nd argument, so we define a struct_stat macro that expands - to the appropriate type on Windows, and to the regular struct stat - on Unix. - - Note that Borland C 5.5 has 64-bit stat (_stati64), but not a - 64-bit fstat! Because of that we also need a struct_fstat that - points to struct_stat on Unix and on Windows, except under Borland, - where it points to the 32-bit struct stat. */ - -#ifndef __BORLANDC__ -# define fstat(fd, buf) _fstati64 (fd, buf) -# define struct_stat struct _stati64 -# define struct_fstat struct _stati64 -#else /* __BORLANDC__ */ -# define struct_stat struct stati64 -# define struct_fstat struct stat -#endif /* __BORLANDC__ */ - #define PATH_SEPARATOR '\\' -#ifdef HAVE_ISATTY -#ifdef _MSC_VER -# define isatty _isatty -#endif -#endif - /* Win32 doesn't support the MODE argument to mkdir. */ -#define mkdir(a, b) _mkdir(a) +#include +#define mkdir(a, b) (mkdir) (a) /* Additional declarations needed for IPv6: */ #ifdef ENABLE_IPV6 const char *inet_ntop (int, const void *, char *, socklen_t); -/* MinGW 3.7 (or older) prototypes gai_strerror(), but is missing - from all import libraries. */ -# ifdef __MINGW32__ -# undef gai_strerror -# define gai_strerror windows_strerror -# endif -#endif /* ENABLE_IPV6 */ +#endif #ifndef INHIBIT_WRAP diff --git a/windows/ChangeLog b/windows/ChangeLog index 683617eb..f047fc6d 100644 --- a/windows/ChangeLog +++ b/windows/ChangeLog @@ -1,3 +1,13 @@ +2005-07-07 Hrvoje Niksic + + * config.h.mingw: Removed. + + * config.h.bor: Removed. + + * config.h.ms: Removed. + + * config-compiler.h: New file. + 2005-07-06 Hrvoje Niksic * config.h: New file. diff --git a/windows/config-compiler.h b/windows/config-compiler.h new file mode 100644 index 00000000..69e43562 --- /dev/null +++ b/windows/config-compiler.h @@ -0,0 +1,118 @@ +/* Support for various Windows compilation environments. + Copyright (C) 2005 Free Software Foundation, Inc. + +This file is part of GNU Wget. + +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. + +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 Wget; if not, write to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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. */ + + +/* This file contains specifics of various compilers supported on the + Windows platform. In this case "compiler" can refer either to the + specific compiler feature (such as how to construct a 64-bit + constant) or to a feature of the compilation environment shipped + with the compiler. + + The file is divided into sections for each compiler. Most of the + explanatory comments are in the first (MinGW) section to avoid + repetition. + + Things that apply to *all* compilers, as well as things that are + specific to Wget, belong in src/mswindows.h. */ + +/* -------------------- */ +/* MinGW (GCC) section. */ +/* -------------------- */ +#if defined __GNUC__ + +#define LL(n) n##LL + +/* Transparently support statting large files, like POSIX's LFS API + does. All Windows compilers we support use _stati64 (but have + different names for 2nd argument type, see below), so we use + that. */ +#define stat(fname, buf) _stati64 (fname, buf) + +/* On Windows the 64-bit stat requires an explicitly different type + for the 2nd argument, so we define a struct_stat macro that expands + to the appropriate type on Windows, and to the regular struct stat + on Unix. + + Note that Borland C 5.5 has 64-bit stat (_stati64), but not a + 64-bit fstat! Because of that we also need a struct_fstat that + points to struct_stat on Unix and on Windows, except under Borland, + where it points to the 32-bit struct stat. */ + +#define struct_stat struct _stati64 +#define struct_fstat struct _stati64 + +/* MinGW 3.7 (or older) prototypes gai_strerror(), but is missing + from all import libraries. */ +#ifdef ENABLE_IPV6 +# undef gai_strerror +# define gai_strerror windows_strerror +# endif +#endif + +/* -------------------- */ +/* MS Visual C section. */ +/* -------------------- */ +#elif defined _MSC_VER + +#define LL(n) n##I64 + +#define stat(fname, buf) _stati64 (fname, buf) +#define struct_stat struct _stati64 +#define struct_fstat struct _stati64 + +#define isatty _isatty + +/* ------------------ */ +/* Borland C section. */ +/* ------------------ */ +#elif defined __BORLANDC__ + +#define LL(n) n##I64 +#define stat(fname, buf) _stati64 (fname, buf) +#define struct_stat struct stati64 +#define struct_fstat struct stat + +/* ------------------------------ */ +/* Digital Mars Compiler section. */ +/* ------------------------------ */ +#elif defined __DMC__ + +#define LL(n) n##LL +#undef stat +#undef struct_stat +#undef struct_fstat + +/* DMC's runtime supports some POSIX and C99 features we use. */ +#define HAVE_USLEEP 1 +#define HAVE_STDBOOL_H 1 +#define HAVE__BOOL 1 + +#else +# error Your compiler is not supported. +#endif diff --git a/windows/config.h b/windows/config.h index fe9d3c2f..254a7920 100644 --- a/windows/config.h +++ b/windows/config.h @@ -74,7 +74,7 @@ #undef HAVE_SIGSETJMP /* Define to 1 if the system has the type `sig_atomic_t'. */ -#undef HAVE_SIG_ATOMIC_T +#define HAVE_SIG_ATOMIC_T 1 /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 diff --git a/windows/config.h.bor b/windows/config.h.bor deleted file mode 100644 index eded0cbc..00000000 --- a/windows/config.h.bor +++ /dev/null @@ -1,150 +0,0 @@ -/* Configuration header file. - Copyright (C) 1995, 1996, 1997, 1998, 2004 - Free Software Foundation, Inc. - - This program 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, - 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. - - 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 - -#define HAVE_SNPRINTF 1 - -#define HAVE_MEMMOVE 1 -#define ftruncate chsize -#define inline __inline - -/* Define if the free Borland C++Builder 5.5 command-line compiler is used, - because its utime() has a bug. */ -#define HACK_BCC_UTIME_BUG - -#ifdef HACK_BCC_UTIME_BUG -#define utime borland_utime -#endif - -/* Define if you have the header file. */ -#undef HAVE_ALLOCA_H - -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define if your architecture is big endian (with the most - significant byte first). */ -#undef WORDS_BIGENDIAN - -/* Define this if you want the NLS support. */ -#undef ENABLE_NLS - -/* Define if you want the FTP support for Opie compiled in. */ -#define ENABLE_OPIE 1 - -/* Define if you want the HTTP Digest Authorization compiled in. */ -#define ENABLE_DIGEST 1 - -/* Define if you want the NTLM authorization support compiled in. */ -#ifdef HAVE_SSL -# define ENABLE_NTLM -#endif - -/* Define if you want the debug output support compiled in. */ -#define ENABLE_DEBUG 1 - -/* Define if you have sys/time.h header. */ -#undef HAVE_SYS_TIME_H - -/* Define if you have struct utimbuf. */ -#define HAVE_STRUCT_UTIMBUF 1 - -/* Define if you have the gethostbyname function. */ -/* #undef HAVE_GETHOSTBYNAME */ - -/* Define if you have the strdup function. */ -#define HAVE_STRDUP 1 - -/* Define if you have the strcasecmp function. */ -#define HAVE_STRCASECMP 1 - -/* Define if you have the strncasecmp function. */ -#define HAVE_STRNCASECMP 1 - -/* Define if you have the strptime function. */ -#undef HAVE_STRPTIME - -/* Define if you have the symlink function. */ -#undef HAVE_SYMLINK - -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define if you have the header file. */ -#define HAVE_UTIME_H 1 - -/* Define if you have the header file. */ -#undef HAVE_SYS_UTIME_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define if you have the header file. */ -#undef HAVE_PWD_H - -/* Define to be the name of the operating system. */ -#define OS_TYPE "Windows" - -#define CTRLBREAK_BACKGND 1 - -/* Define if we're compiling in support for MD5. */ -#define HAVE_MD5 1 - -/* Define if we're using Solaris libmd5. */ -#undef HAVE_SOLARIS_MD5 - -/* Define if we're using builtin (GNU) md5.c. */ -#define HAVE_BUILTIN_MD5 1 - -/* Define if you have the isatty function. */ -#define HAVE_ISATTY 1 - -/* Define to the length of short. */ -#define SIZEOF_SHORT 2 - -/* Define to the length of int. */ -#define SIZEOF_INT 4 - -/* Define to the length of long. */ -#define SIZEOF_LONG 4 - -/* Defined to int or size_t on systems without socklen_t. */ -#define socklen_t int - -/* Define if you have uint32_t. */ -/* #define HAVE_UINT32_T */ - -#include "config-post.h" - -#endif /* CONFIG_H */ diff --git a/windows/config.h.mingw b/windows/config.h.mingw deleted file mode 100644 index fc43a4fb..00000000 --- a/windows/config.h.mingw +++ /dev/null @@ -1,272 +0,0 @@ -/* Configuration header file. - Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2004 - Free Software Foundation, Inc. - -This file is part of GNU Wget. - -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. - -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 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 CONFIG_H -#define CONFIG_H - -/* Define if you have the header file. */ -/* #undef HAVE_ALLOCA_H */ - -/* Flag that C files should include , not . */ -#define WGET_USE_STDARG - -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to empty or __inline__ or __inline. */ -/* #undef inline */ - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define to `int' if doesn't define. */ -/* #undef pid_t */ - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define as the return type of signal handlers (int or void). */ -#define RETSIGTYPE void - -/* Define if your architecture is big endian (with the most - significant byte first). */ -/* #undef WORDS_BIGENDIAN */ - -#define ftruncate chsize - -/* Define to the length of short. */ -#define SIZEOF_SHORT 2 - -/* Define to the length of int. */ -#define SIZEOF_INT 4 - -/* Define to the length of long. */ -#define SIZEOF_LONG 4 - -/* Define to the length of long long. */ -#define SIZEOF_LONG_LONG 8 - -/* Define this if you want the NLS support. */ -/* #undef HAVE_NLS */ - -/* Define if you want the FTP support for Opie compiled in. */ -#define ENABLE_OPIE 1 - -/* Define if you want the NTLM authorization support compiled in. */ -#ifdef HAVE_SSL -# define ENABLE_NTLM -#endif - -/* Define if you want the HTTP Digest Authorization compiled in. */ -#define ENABLE_DIGEST 1 - -/* Define if you want the debug output support compiled in. */ -#define ENABLE_DEBUG 1 - -/* Define to 1 if the system has the type `sig_atomic_t'. */ -#define HAVE_SIG_ATOMIC_T 1 - -/* Define if you have sys/time.h header. */ -#define HAVE_SYS_TIME_H 1 - -/* Define if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 - -/* Define if you have struct utimbuf. */ -#define HAVE_STRUCT_UTIMBUF 1 - -/* Define if you have the uname function. */ -/* #undef HAVE_UNAME */ - -/* Define if you have a working version of mmap. */ -/* #undef HAVE_MMAP */ - -/* Define if you have the gethostname function. */ -/* #undef HAVE_GETHOSTNAME */ - -/* Define if you have the select function. */ -/* #undef HAVE_SELECT */ - -/* Define if you have the gettimeofday function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define if you have the strdup function. */ -#define HAVE_STRDUP 1 - -/* Define if you have the sys/utsname.h header. */ -/* #undef HAVE_SYS_UTSNAME_H */ - -/* Define if you have the strerror function. */ -#define HAVE_STRERROR 1 - -/* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 1 - -/* Define if you have the vsnprintf function. */ -#define HAVE_VSNPRINTF 1 - -/* Define if you have the strstr function. */ -#define HAVE_STRSTR 1 - -/* Define if you have the strcasecmp function. */ -#define HAVE_STRCASECMP 1 - -/* Define if you have the strncasecmp function. */ -#define HAVE_STRNCASECMP 1 - -/* Define if you have the strpbrk function. */ -#define HAVE_STRPBRK 1 - -/* Define if you have the memmove function. */ -#define HAVE_MEMMOVE 1 - -/* Define if you have the strptime function. */ -/* #undef HAVE_STRPTIME */ - -/* Define if you have the mktime function. */ -#define HAVE_MKTIME 1 - -/* Define if you have the symlink function. */ -/* #undef HAVE_SYMLINK */ - -/* Define if you have the access function. */ -#define HAVE_ACCESS 1 - -/* Define if you have the isatty function. */ -#define HAVE_ISATTY 1 - -/* Define if you have the signal function. */ -/* #undef HAVE_SIGNAL */ - -/* Define if you have the sigsetjmp function. */ -/* #undef HAVE_SIGSETJMP */ - -/* Define if you have the sigblock function. */ -/* #undef HAVE_SIGBLOCK */ - -/* Define if you have the gettext function. */ -/* #undef HAVE_GETTEXT */ - -/* Define if you have the usleep function. */ -/* #undef HAVE_USLEEP */ - -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define if you have the header file. */ -#define HAVE_STDARG_H 1 - -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if you have the header file. */ -#define HAVE_UTIME_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_UTIME_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_TERMIOS_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_IOCTL_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_SELECT_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_PWD_H */ - -/* Define if you have the header file. */ -#define HAVE_SIGNAL_H 1 - -/* Define if you have the header file. */ -#define HAVE_SETJMP_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_LIBINTL_H */ - -/* Define if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define to be the name of the operating system. */ -#define OS_TYPE "mingw32" - -/* Define if you wish to compile with socks support. */ -/* #undef HAVE_SOCKS */ - -/* Define to 1 if ANSI function prototypes are usable. */ -#define PROTOTYPES 1 - -/* Define if all libs needed for ssl support are existing */ -/* #undef HAVE_SSL */ - -/* Define if we're compiling in support for MD5. */ -#define HAVE_MD5 1 - -/* Define if we're using Solaris libmd5. */ -/* #undef HAVE_SOLARIS_MD5 */ - -/* Define if we're using OpenSSL md5. */ -/* #undef HAVE_OPENSSL_MD5 */ - -/* Define if we're using builtin (GNU) md5.c. */ -#define HAVE_BUILTIN_MD5 1 - -/* Define if you have the getaddrinfo function. */ -/* #undef HAVE_GETADDRINFO */ - -/* Define if the system headers support the AI_ADDRCONFIG flag. */ -/* #undef HAVE_GETADDRINFO_AI_ADDRCONFIG */ - -/* Define if the system headers support the AI_V4MAPPED flag. */ -/* #undef HAVE_GETADDRINFO_AI_V4MAPPED */ - -/* Define if the system headers support the AI_ALL flag. */ -/* #undef HAVE_GETADDRINFO_AI_ALL */ - -/* Define if the system supports struct sockaddr_in6 */ -/* #undef HAVE_HAVE_STRUCT_SOCKADDR_IN6 */ - -/* Define if struct sockaddr_in6 has the sin6_scope_id member */ -#define HAVE_SOCKADDR_IN6_SCOPE_ID - -/* Define if you want to enable the IPv6 support. */ -/* #undef ENABLE_IPV6 */ - -/* Defined to int or size_t on systems without socklen_t. */ -#define socklen_t int - -/* Define if you have uint32_t. */ -#define HAVE_UINT32_T - -#include "config-post.h" - -#endif /* CONFIG_H */ diff --git a/windows/config.h.ms b/windows/config.h.ms deleted file mode 100644 index 29f1d811..00000000 --- a/windows/config.h.ms +++ /dev/null @@ -1,152 +0,0 @@ -/* Configuration header file. - Copyright (C) 1995, 1996, 1997, 1998, 2004 - Free Software Foundation, Inc. - - This program 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, - 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. - - 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 - -/* Define if you have the header file. */ -#undef HAVE_ALLOCA_H - -/* Define to empty if the keyword does not work. */ -/* #undef const */ - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define if your architecture is big endian (with the most - significant byte first). */ -#undef WORDS_BIGENDIAN - -/* Define if you want the FTP support for Opie compiled in. */ -#define ENABLE_OPIE 1 - -/* Define if you want the HTTP Digest Authorization compiled in. */ -#define ENABLE_DIGEST 1 - -/* Define if you want the NTLM authorization support compiled in. */ -#ifdef HAVE_SSL -# define ENABLE_NTLM -#endif - -/* Define if you want the debug output support compiled in. */ -#define ENABLE_DEBUG 1 - -/* Define if you have sys/time.h header. */ -#undef HAVE_SYS_TIME_H - -/* Define if you have struct utimbuf. */ -#define HAVE_STRUCT_UTIMBUF 1 - -/* Define if you have the gethostbyname function. */ -/* #undef HAVE_GETHOSTBYNAME */ - -/* Define if you have the strdup function. */ -#define HAVE_STRDUP 1 - -/* Define if you have the snprintf function. */ -#define HAVE_SNPRINTF 1 - -/* Define if you have the vsnprintf function. */ -#define HAVE_VSNPRINTF 1 - -/* Define if you have the strcasecmp function. */ -#define HAVE_STRCASECMP 1 - -/* Define if you have the strncasecmp function. */ -#define HAVE_STRNCASECMP 1 - -/* Define if you have the strptime function. */ -#undef HAVE_STRPTIME - -/* Define if you have the symlink function. */ -#undef HAVE_SYMLINK - -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H - -/* None except Digital Mars have sleep/usleep functions */ -#if defined(__DMC__) -#define HAVE_USLEEP 1 -#define HAVE_SLEEP 1 -#endif - -/* Define if you have the header file. */ -#undef HAVE_UTIME_H - -/* Define if you have the header file. */ -#define HAVE_SYS_UTIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LOCALE_H 1 - -/* Define if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define if you have the header file. */ -#undef HAVE_PWD_H - -/* Define to be the name of the operating system. */ -#define OS_TYPE "Windows" - -#define CTRLBREAK_BACKGND 1 - -/* Define if we're compiling in support for MD5. */ -#define HAVE_MD5 1 - -/* Define if we're using Solaris libmd5. */ -#undef HAVE_SOLARIS_MD5 - -/* Define if we're using builtin (GNU) md5.c. */ -#define HAVE_BUILTIN_MD5 1 - -/* Work around VC 6 issues */ -#define inline __inline -#define ftruncate chsize - -/* Define if you have the isatty function. */ -#define HAVE_ISATTY 1 - -/* Define to the length of short. */ -#define SIZEOF_SHORT 2 - -/* Define to the length of int. */ -#define SIZEOF_INT 4 - -/* Define to the length of long. */ -#define SIZEOF_LONG 4 - -/* Defined to int or size_t on systems without socklen_t. */ -#define socklen_t int - -/* Define if you have uint32_t. */ -#undef HAVE_UINT32_T - -#include "config-post.h" - -#endif /* CONFIG_H */