diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2013-07-21 00:42:39 -0400 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2013-07-21 00:42:39 -0400 |
| commit | e16dad6521b5662ea017de8b639301bd996415c7 (patch) | |
| tree | 5c49ff9aad0a0d3f7eb226345a9b92ce9b76a32f /WWW | |
| parent | 519c2333fe3cb89fd34236753a09b4b2f60cbce1 (diff) | |
| download | lynx-snapshots-e16dad6521b5662ea017de8b639301bd996415c7.tar.gz | |
snapshot of project "lynx", label v2-8-8dev_15i
Diffstat (limited to 'WWW')
| -rw-r--r-- | WWW/Library/Implementation/HTAABrow.c | 4 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTTCP.c | 6 | ||||
| -rw-r--r-- | WWW/Library/Implementation/www_tcp.h | 17 |
3 files changed, 22 insertions, 5 deletions
diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c index bb32c94b..8e8a375a 100644 --- a/WWW/Library/Implementation/HTAABrow.c +++ b/WWW/Library/Implementation/HTAABrow.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTAABrow.c,v 1.38 2013/04/30 09:11:00 tom Exp $ + * $LynxId: HTAABrow.c,v 1.39 2013/07/21 00:14:39 tom Exp $ * * MODULE HTAABrow.c * BROWSER SIDE ACCESS AUTHORIZATION MODULE @@ -747,7 +747,7 @@ static HTAAScheme HTAA_selectScheme(HTAASetup * setup) if (setup && setup->valid_schemes) { for (scheme = HTAA_BASIC; scheme < HTAA_MAX_SCHEMES; scheme++) { - void *object = (void *) scheme; + void *object = (void *) (intptr_t) scheme; if (-1 < HTList_indexOf(setup->valid_schemes, object)) return (HTAAScheme) scheme; diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index 7ba0884e..42514ad3 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTCP.c,v 1.125 2013/05/06 00:07:19 tom Exp $ + * $LynxId: HTTCP.c,v 1.126 2013/07/21 00:22:52 tom Exp $ * * Generic Communication Code HTTCP.c * ========================== @@ -362,10 +362,12 @@ typedef struct _statuses { * SIGKILL), but don't go through normal libc exit() processing, which * would screw up parent's stdio. -BL */ +#ifdef NSL_FORK static void quench(int sig GCC_UNUSED) { _exit(2); } +#endif int lynx_nsl_status = HT_OK; @@ -642,7 +644,7 @@ static unsigned long __stdcall _fork_func(void *arg) #endif if (gbl_phost) { - rehostentlen = fill_rehostent(&rehostent, gbl_phost); + rehostentlen = fill_rehostent((void **) &rehostent, gbl_phost); if (rehostentlen == 0) { gbl_phost = (LYNX_HOSTENT *) NULL; } else { diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h index 63178adf..29b47adf 100644 --- a/WWW/Library/Implementation/www_tcp.h +++ b/WWW/Library/Implementation/www_tcp.h @@ -1,5 +1,5 @@ /* System dependencies in the W3 library - * $LynxId: www_tcp.h,v 1.53 2011/05/24 23:48:50 tom Exp $ + * $LynxId: www_tcp.h,v 1.54 2013/07/20 14:08:29 tom Exp $ * SYSTEM DEPENDENCIES @@ -282,13 +282,28 @@ extern int ws_netread(int fd, char *buf, int len); #undef EAGAIN #endif /* _MSC_VER */ +#undef EINPROGRESS #define EINPROGRESS (WSABASEERR+36) + +#undef EALREADY #define EALREADY (WSABASEERR+37) + +#undef EISCONN #define EISCONN (WSABASEERR+56) + +#undef EINTR #define EINTR (WSABASEERR+4) + +#undef EAGAIN #define EAGAIN (WSABASEERR+1002) + +#undef ENOTCONN #define ENOTCONN (WSABASEERR+57) + +#undef ECONNRESET #define ECONNRESET (WSABASEERR+54) + +#undef ETIMEDOUT #define ETIMEDOUT WSAETIMEDOUT #endif /* USE_WINSOCK2_H */ |