texinfo ChangeLog system.h info/pcterm.c info/s...

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     12/11/26 01:32:03

Modified files:
        .              : ChangeLog system.h 
        info           : pcterm.c session.c terminal.c 

Log message:
        more from Eli

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1456&r2=1.1457
http://cvs.savannah.gnu.org/viewcvs/texinfo/system.h?cvsroot=texinfo&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/pcterm.c?cvsroot=texinfo&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/session.c?cvsroot=texinfo&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/terminal.c?cvsroot=texinfo&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1456
retrieving revision 1.1457
diff -u -b -r1.1456 -r1.1457
--- ChangeLog   26 Nov 2012 01:25:33 -0000      1.1456
+++ ChangeLog   26 Nov 2012 01:32:03 -0000      1.1457
@@ -1,7 +1,23 @@
-2012-11-23  Karl Berry  <address@hidden>
+2012-11-26  Karl Berry  <address@hidden>
 
        * pretest 4.13.91.
 
+2012-11-25  Karl Berry  <address@hidden>
+
+       * system.h (const): do not #undef around gettext.h.
+       Suggested by Eli.  We'll see.
+
+2012-11-16  Eli Zaretskii  <address@hidden>
+       
+       * info/pcterm.c (gettextinfo): exit rather than xexit.
+       (tputs, tgoto, tgetent): use const.
+       * info/session.c [!FIONREAD]: require F_GETFL and F_SETFL as well
+       as O_NDELAY for this branch.
+       * info/terminal.c (tputs) [! HAVE_TERMCAP_H]: declare puts as
+       returning int.
+
+2012-11-23  Karl Berry  <address@hidden>
+
        * doc/texinfo.txi (makeinfo Pointer Creation): be more
        explicit about what to do.  Suggestion from Richard Jackson,
        help-texinfo 18 Feb 2003 23:54:07.

Index: system.h
===================================================================
RCS file: /sources/texinfo/texinfo/system.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- system.h    16 Nov 2012 23:33:28 -0000      1.15
+++ system.h    26 Nov 2012 01:32:03 -0000      1.16
@@ -1,5 +1,5 @@
 /* system.h: system-dependent declarations; include this first.
-   $Id: system.h,v 1.15 2012/11/16 23:33:28 karl Exp $
+   $Id: system.h,v 1.16 2012/11/26 01:32:03 karl Exp $
 
    Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
    2006, 2007, 2008, 2009, 2010, 2011
@@ -45,9 +45,7 @@
 #include <unistd.h>
 
 /* For gettext (NLS).  */
-#define const
 #include "gettext.h"
-#undef const
 
 #define _(String) gettext (String)
 #define N_(String) (String)

Index: info/pcterm.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/pcterm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- info/pcterm.c       16 Nov 2012 23:33:28 -0000      1.10
+++ info/pcterm.c       26 Nov 2012 01:32:03 -0000      1.11
@@ -1,5 +1,5 @@
 /* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
-   $Id: pcterm.c,v 1.10 2012/11/16 23:33:28 karl Exp $
+   $Id: pcterm.c,v 1.11 2012/11/26 01:32:03 karl Exp $
 
    Copyright (C) 1998, 1999, 2003, 2004, 2007, 2008, 2012
    Free Software Foundation, Inc.
@@ -178,7 +178,7 @@
        sprintf (errbuf, "w32 error %u", error_no);
       CloseHandle (hinfo);
       info_error (_("Terminal cannot be initialized: %s\n"), errbuf, NULL);
-      xexit (1);
+      exit (1);
     }
 }
 
@@ -1301,14 +1301,14 @@
 
 /* These should never be called, but they make the linker happy.  */
 
-void       tputs (char *a, int b, int (*c)())
+int       tputs (const char *a, int b, int (*c)(int))
 {
-  perror ("tputs");
+  perror ("tputs"); return 0; /* here and below, added dummy retvals */
 }
 
-char*     tgoto (char*a, int b, int c)
+char*     tgoto (const char *a, int b, int c)
 {
-  perror ("tgoto"); return 0; /* here and below, added dummy retvals */
+  perror ("tgoto"); return 0;
 }
 
 int       tgetnum (char*a)
@@ -1326,7 +1326,7 @@
   perror ("tgetstr"); return 0;
 }
 
-int       tgetent (char*a, char*b)
+int       tgetent (char *a, const char *b)
 {
   perror ("tgetent"); return 0;
 }

Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- info/session.c      16 Nov 2012 23:33:28 -0000      1.57
+++ info/session.c      26 Nov 2012 01:32:03 -0000      1.58
@@ -1,5 +1,5 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.57 2012/11/16 23:33:28 karl Exp $
+   $Id: session.c,v 1.58 2012/11/26 01:32:03 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
    2004, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
@@ -5403,7 +5403,7 @@
       chars_avail = read (tty, &input[0], chars_avail);
   }
 #else /* !FIONREAD */
-#  if defined (O_NDELAY)
+#  if defined (O_NDELAY) && defined (F_GETFL) && defined (F_SETFL)
   {
     int flags;
 

Index: info/terminal.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/terminal.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- info/terminal.c     16 Nov 2012 23:34:51 -0000      1.9
+++ info/terminal.c     26 Nov 2012 01:32:03 -0000      1.10
@@ -1,5 +1,5 @@
 /* terminal.c -- how to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.9 2012/11/16 23:34:51 karl Exp $
+   $Id: terminal.c,v 1.10 2012/11/26 01:32:03 karl Exp $
 
    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998,
    1999, 2001, 2002, 2004, 2007, 2008, 2012 Free Software Foundation, Inc.
@@ -43,7 +43,7 @@
 short ospeed; /* Terminal output baud rate */
 extern int tgetnum (), tgetflag (), tgetent ();
 extern char *tgetstr (), *tgoto ();
-extern void tputs ();
+extern int tputs ();
 #endif /* not HAVE_TERMCAP_H */
 #endif /* not HAVE_NCURSES_TERMCAP_H */