diff options
| -rw-r--r-- | CHANGES | 7 | ||||
| -rw-r--r-- | WWW/Library/Implementation/HTUtils.h | 7 | ||||
| -rw-r--r-- | src/LYGlobalDefs.h | 6 | ||||
| -rw-r--r-- | src/LYUtils.c | 8 |
4 files changed, 18 insertions, 10 deletions
diff --git a/CHANGES b/CHANGES index 02d3c6e2..4152bf5e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,12 @@ --- $LynxId: CHANGES,v 1.650 2013/07/20 14:20:17 tom Exp $ +-- $LynxId: CHANGES,v 1.652 2013/07/29 00:56:09 tom Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== -2013-07-20 (2.8.8dev.16) +2013-07-28 (2.8.8dev.16) +* build-fix for setmode() definition on Cygwin -TD +* modify HTUtils.h to work around header conflict with Cygwin w32api and + openssl 1.0.1e (prompted by report/patch by Supriyo Biswas) -TD * protect redefined errno values for Windows port from redefinition warnings when using MinGW build, since the WSAxxx values are what the configuration actually uses -TD diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index a083df4a..74cf332f 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -1,5 +1,5 @@ /* - * $LynxId: HTUtils.h,v 1.113 2013/04/30 22:45:03 tom Exp $ + * $LynxId: HTUtils.h,v 1.115 2013/07/28 23:04:57 tom Exp $ * * Utility macros for the W3 code library * MACROS FOR GENERAL USE @@ -178,6 +178,9 @@ extern int ignore_unused; #endif #if defined(__CYGWIN__) /* 1998/12/31 (Thu) 16:13:46 */ +#ifdef USE_OPENSSL_INCL +#define NOCRYPT /* workaround for openssl 1.0.1e bug */ +#endif #include <windows.h> /* #include "windef.h" */ #define BOOLEAN_DEFINED #undef HAVE_POPEN /* FIXME: does this not work, or is it missing */ @@ -223,8 +226,10 @@ extern off_t LYatoll(const char *value); #include <dos.h> #endif +#if !defined(__MINGW32__) #undef sleep /* 1998/06/23 (Tue) 16:54:53 */ extern void sleep(unsigned __seconds); +#endif #define popen _popen #define pclose _pclose diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index f7154528..4d6a3fc8 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: LYGlobalDefs.h,v 1.135 2013/05/30 00:00:31 tom Exp $ + * $LynxId: LYGlobalDefs.h,v 1.136 2013/07/29 00:29:14 tom Exp $ * * global variable definitions */ @@ -666,9 +666,7 @@ extern "C" { #endif #if defined(__CYGWIN__) - extern void cygwin_conv_to_full_win32_path(char *posix, char *dos); - extern void cygwin_conv_to_full_posix_path(char *dos, char *posix); - extern int setmode(int handle, int amode); +#include <io.h> #endif #if !defined(__CYGWIN__) && defined(__CYGWIN32__) diff --git a/src/LYUtils.c b/src/LYUtils.c index a84d08c9..88fbf275 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -1,5 +1,5 @@ /* - * $LynxId: LYUtils.c,v 1.240 2013/07/21 00:40:35 tom Exp $ + * $LynxId: LYUtils.c,v 1.242 2013/07/29 00:33:32 tom Exp $ */ #include <HTUtils.h> #include <HTTCP.h> @@ -4524,6 +4524,7 @@ int win32_check_interrupt(void) return FALSE; } +#if !defined(__MINGW32__) void sleep(unsigned sec) { unsigned int i, j; @@ -4538,7 +4539,8 @@ void sleep(unsigned sec) } } } -#endif +#endif /* !__MINGW32__ */ +#endif /* _WINDOWS */ /* * This function rewrites and reallocates a previously allocated string so that @@ -7321,7 +7323,7 @@ int Cygwin_Shell(void) 0, 0, &startUpInfo, &procInfo); if (!code) { - printf("shell = [%s], code = %ld\n", shell, GetLastError()); + printf("shell = [%s], code = %ld\n", shell, (long) GetLastError()); } /* wait for the child to return (this is not a requirement |