Re: lynx-dev lynx281pre1 patch : LYUtils.c/termio.h

[dickey]

> 
> Compiling lynx281pre1 on sysV68 R3V7.1 fails with the following : 
>  
> gcc -DHAVE_CONFIG_H  -I. -I.. -Ichrtrans 
> -I/share/gnu/src/lynx2-8-1/src/chrtrans 
>  -I/share/gnu/src/lynx2-8-1 -I/share/gnu/src/lynx2-8-1/src 
> -I/share/gnu/src/lynx 
> 2-8-1/WWW/Library/Implementation  -O2  -c 
> /share/gnu/src/lynx2-8-1/src/LYUtils.c 
> In file included from /usr/include/termio.h:3, 
>                  from /share/gnu/src/lynx2-8-1/src/LYUtils.c:2836: 
> /usr/include/sys/termio.h:135: redefinition of `struct termio' 
> /usr/include/sys/termio.h:188: redefinition of `struct termcb' 
> gnumake[1]: *** [LYUtils.o] Error 1 
> gnumake[1]: Leaving directory `/backup/tmp/lynx281pre1/src' 
> gnumake: *** [all] Error 2 
>  
> Here is a fix : 

it'll need more conditions (your fix breaks one of my builds).  I'll look
at this again (now that I see what your error message is).  thanks.
  
> Do not include termio.h and friends twice in LYUtils.c, to allow 
> compilation on sysV68 (Philippe De Muyter <address@hidden>). 
>  
> --- ./src/LYUtils.c   Wed Sep 23 22:51:25 1998 
> +++ ./src/LYUtils.c   Wed Sep 23 22:28:04 1998 
> @@ -2825,6 +2825,7 @@ 
>  #include <sys/ioctl.h> 
>  #endif 
>   
> +#if 0 /* This is already done by LYCurses.h above */ 

no - it isn't (LYCurses.h doesn't include termio.h)

>  /* For systems that have both, but both can't be included, duh */ 
>  #ifdef TERMIO_AND_TERMIOS 
>  # include <termio.h> 
> @@ -2837,6 +2838,7 @@ 
>  #  endif /* HAVE_TERMIO_H */ 
>  # endif /* HAVE_TERMIOS_H */ 
>  #endif       /* TERMIO_AND_TERMIOS */ 
> +#endif /* 0 */ 
>   
>  PUBLIC void size_change ARGS1( 
>       int,            sig GCC_UNUSED) 


-- 
Thomas E. Dickey
address@hidden
http://www.clark.net/pub/dickey