lynx-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

lynx-dev lynx281pre11/LYUtils/termio patch


From: Philippe De Muyter
Subject: lynx-dev lynx281pre11/LYUtils/termio patch
Date: Sun, 18 Oct 1998 02:12:47 +0200 (CEST)

lynx2-8-1.pre11 still fails to compile on sysV68 R3V7.1, with the following
message :

    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/lynx2-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:2835:
    /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/lynx281pre11/src'
    gnumake: *** [all] Error 2

Here is a fix :

* Include termio.h in LYCurses.c only #ifdef TERMIO_AND_CURSES (Philippe
De Muyter <address@hidden>)

--- ./src/LYUtils.c     Sun Oct 18 01:58:13 1998
+++ ./src/LYUtils.c     Sun Oct 18 01:19:13 1998
@@ -2823,8 +2823,6 @@
 /* For systems that have both, but both can't be included, duh (or neither) */
 /* FIXME: this whole chunk may be redundant */
 #ifdef TERMIO_AND_CURSES
-# include <termio.h>
-# else
 # ifdef TERMIO_AND_TERMIOS
 #  include <termio.h>
 # else
@@ -2836,7 +2834,7 @@
 #   endif /* HAVE_TERMIO_H */
 #  endif /* HAVE_TERMIOS_H */
 # endif        /* TERMIO_AND_TERMIOS */
-#endif /* USE_TERMIO_H */
+#endif /* TERMIO_AND_CURSES */
 
 PUBLIC void size_change ARGS1(
        int,            sig GCC_UNUSED)

reply via email to

[Prev in Thread] Current Thread [Next in Thread]