Re: texinfo-4.13.90 pretest available

[Eli Zaretskii]

> Date: Sun, 18 Nov 2012 05:56:11 +0200
> From: Eli Zaretskii <address@hidden>
> Cc: address@hidden
> 
> > Date: Sat, 17 Nov 2012 23:20:18 GMT
> > From: address@hidden (Karl Berry)
> > Cc: address@hidden, address@hidden
> > 
> >     Here's a cumulative patch:
> > 
> > Thanks for sending, but I already installed your changes from your
> > January message, so I can't easily install this.  Can you remake your
> > patch relative to the current sources?
> 
> Ugh.  Will do.

Please find below diffs against today's CVS.

There are 2 issues left, after applying the patch:

 . Perhaps remove the "#undef const" part from system.h entirely,
   instead of commenting it out like I did in the patch.

 . Add to configure.ac a test that looks for a library with regcomp
   and regexec functions, instead of assuming they are in libc.

Thanks.

diff -up -r texinfo/info/pcterm.c texinfo-4.13.90/info/pcterm.c
--- texinfo/info/pcterm.c       2012-11-19 20:31:12.359375000 +0200
+++ texinfo-4.13.90/info/pcterm.c       2012-11-17 15:06:36.812500000 +0200
@@ -178,7 +178,7 @@ gettextinfo (struct text_info *ti)
        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 @@ kill (pid_t pid, int sig)
 
 /* 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 @@ char*     tgetstr (char *a, char **b)
   perror ("tgetstr"); return 0;
 }
 
-int       tgetent (char*a, char*b)
+int       tgetent (char *a, const char *b)
 {
   perror ("tgetent"); return 0;
 }
diff -up -r texinfo/info/session.c texinfo-4.13.90/info/session.c
--- texinfo/info/session.c      2012-11-19 20:31:13.234375000 +0200
+++ texinfo-4.13.90/info/session.c      2012-11-17 14:54:36.015625000 +0200
@@ -5403,7 +5403,7 @@ info_gather_typeahead (void)
       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;
 
diff -up -r texinfo/info/terminal.c texinfo-4.13.90/info/terminal.c
--- texinfo/info/terminal.c     2012-11-19 20:31:13.421875000 +0200
+++ texinfo-4.13.90/info/terminal.c     2012-11-17 15:36:39.390625000 +0200
@@ -43,7 +43,7 @@ char PC;      /* Pad character */
 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 */
 
diff -up -r texinfo/system.h texinfo-4.13.90/system.h
--- texinfo/system.h    2012-11-19 20:30:52.125000000 +0200
+++ texinfo-4.13.90/system.h    2012-11-17 14:40:40.531250000 +0200
@@ -45,9 +45,9 @@
 #include <unistd.h>
 
 /* For gettext (NLS).  */
-#define const
+/* #define const */
 #include "gettext.h"
-#undef const
+/* #undef const */
 
 #define _(String) gettext (String)
 #define N_(String) (String)