moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Remove superfluous includes and document existing ones.

Browse Source
This commit is contained in:
hniksic 2005-06-27 12:08:50 -07:00
parent 6267a79939
commit 3d0fda1a28
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2005-06-27 Hrvoje Niksic <hniksic@xemacs.org>
* mswindows.h: Remove superfluous includes.
2005-06-27 Hrvoje Niksic <hniksic@xemacs.org> 2005-06-27 Hrvoje Niksic <hniksic@xemacs.org>
* config-post.h (alloca): Amend alloca declaration to take care of * config-post.h (alloca): Amend alloca declaration to take care of

55
src/mswindows.h
View File

@ -32,20 +32,20 @@ so, delete this exception statement from your version. */
#define MSWINDOWS_H #define MSWINDOWS_H
#ifndef WGET_H #ifndef WGET_H
#error Include mswindows.h inside or after "wget.h" # error This file should not be included directly.
#endif #endif
/* Prevent inclusion of <winsock*.h> in <windows.h>. */ /* Prevent inclusion of <winsock*.h> in <windows.h>. */
#ifndef WIN32_LEAN_AND_MEAN #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
#endif #endif
#include <windows.h> #include <windows.h>
/* Use the correct winsock header; <ws2tcpip.h> includes <winsock2.h> /* We need winsock2.h for IPv6 and ws2tcpip.h for getaddrinfo, so
only on MingW. We cannot use <winsock.h> for IPv6. Using include both in ENABLE_IPV6 case. (ws2tcpip.h includes winsock2.h
getaddrinfo() requires <ws2tcpip.h>. */ only on MinGW.) */
#if defined(ENABLE_IPV6) || defined(HAVE_GETADDRINFO) #ifdef ENABLE_IPV6
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
#else #else
@ -56,15 +56,10 @@ so, delete this exception statement from your version. */
# define EAI_SYSTEM -1 /* value doesn't matter */ # define EAI_SYSTEM -1 /* value doesn't matter */
#endif #endif
/* Must include <sys/stat.h> because of 'stat' define below. */ /* Declares file access functions, such as open, creat, access, and
#include <sys/stat.h> chmod. Unix declares these in unistd.h and fcntl.h. */
/* Missing in several .c files. Include here. */
#include <io.h> #include <io.h>
/* Needed to get alloca() under Win32. */
#include <malloc.h>
#ifndef S_ISDIR #ifndef S_ISDIR
# define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR)) # define S_ISDIR(m) (((m) & (_S_IFMT)) == (_S_IFDIR))
#endif #endif
@ -134,16 +129,24 @@ __int64 str_to_int64 (const char *, char **, int);
#endif #endif
#endif #endif
/* #### Do we need this? */ /* Win32 doesn't support the MODE argument to mkdir. */
#include <direct.h>
/* Windows compilers accept only one arg to mkdir. */
#define mkdir(a, b) _mkdir(a) #define mkdir(a, b) _mkdir(a)
/* Additional declarations needed for IPv6: */
#ifdef ENABLE_IPV6
/* Missing declaration? */
extern const char *inet_ntop (int, const void *, char *, size_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 */
#ifndef INHIBIT_WRAP #ifndef INHIBIT_WRAP
/* Winsock functions don't set errno, so we provide wrappers /* Winsock functions don't set errno, so we provide wrappers that do. */
that do. */
#define socket wrapped_socket #define socket wrapped_socket
#define bind wrapped_bind #define bind wrapped_bind
@ -176,13 +179,6 @@ int wrapped_closesocket (int);
#endif #endif
const char *windows_strerror (int); const char *windows_strerror (int);
/* MingW 3.7 (or older) prototypes gai_strerror(), but is missing
from all import libraries. */
#if defined(__MINGW32__) && defined(ENABLE_IPV6)
# undef gai_strerror
# define gai_strerror windows_strerror
#endif
/* Declarations of various socket errors: */ /* Declarations of various socket errors: */
#define EWOULDBLOCK WSAEWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK
@ -229,11 +225,4 @@ void ws_percenttitle (double);
char *ws_mypath (void); char *ws_mypath (void);
void windows_main (int *, char **, char **); void windows_main (int *, char **, char **);
/* Things needed for IPv6; missing in <ws2tcpip.h>. */
#ifdef ENABLE_IPV6
# ifndef HAVE_INET_NTOP
extern const char *inet_ntop (int af, const void *src, char *dst, size_t size);
# endif
#endif /* ENABLE_IPV6 */
#endif /* MSWINDOWS_H */ #endif /* MSWINDOWS_H */