[5988] fix declaration conflict in pcterm.c

[Gavin D. Smith]

Revision: 5988
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5988
Author:   gavin
Date:     2014-12-25 17:01:34 +0000 (Thu, 25 Dec 2014)
Log Message:
-----------
fix declaration conflict in pcterm.c

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/pcterm.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-12-25 16:52:44 UTC (rev 5987)
+++ trunk/ChangeLog     2014-12-25 17:01:34 UTC (rev 5988)
@@ -1,5 +1,10 @@
 2013-12-25  Eli Zaretskii  <address@hidden>
 
+       * info/pcterm.c (gettextinfo): Pass expected arguments to 
+       info_error.
+
+2013-12-25  Eli Zaretskii  <address@hidden>
+
        * info/terminal.c (terminal_initialize_terminal) 
        <terminal_initialize_terminal_hook>: Call initialize_byte_map.
 

Modified: trunk/info/pcterm.c
===================================================================
--- trunk/info/pcterm.c 2014-12-25 16:52:44 UTC (rev 5987)
+++ trunk/info/pcterm.c 2014-12-25 17:01:34 UTC (rev 5988)
@@ -71,6 +71,7 @@
 #endif
 
 #include "variables.h"
+#include "session.h"
 
 extern int speech_friendly;    /* defined in info.c */
 
@@ -176,7 +177,7 @@
                          errbuf, sizeof (errbuf), NULL))
        sprintf (errbuf, "w32 error %u", error_no);
       CloseHandle (hinfo);
-      info_error (_("Terminal cannot be initialized: %s\n"), errbuf, NULL);
+      info_error (_("Terminal cannot be initialized: %s\n"), errbuf);
       exit (1);
     }
 }
@@ -1189,7 +1190,6 @@
 
 #include <limits.h>
 #include "signals.h"
-#include "session.h"
 
 #ifndef PATH_MAX
 # define PATH_MAX 512