texinfo-commits
[Top][All Lists]
Advanced

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

[6348] Fix compilation warnings in MinGW build.


From: Eli Zaretskii
Subject: [6348] Fix compilation warnings in MinGW build.
Date: Sat, 20 Jun 2015 08:06:48 +0000

Revision: 6348
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6348
Author:   eliz
Date:     2015-06-20 08:06:47 +0000 (Sat, 20 Jun 2015)
Log Message:
-----------
Fix compilation warnings in MinGW build.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/pcterm.c
    trunk/info/session.c
    trunk/system.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-06-19 18:42:47 UTC (rev 6347)
+++ trunk/ChangeLog     2015-06-20 08:06:47 UTC (rev 6348)
@@ -1,3 +1,14 @@
+2015-06-20  Eli Zaretskii  <address@hidden>
+
+       * info/pcterm.c (kill): Move prototype from here...
+       * system.h: ...to here, conditioned by __MINGW32__.  This solves
+       compiler warnings in signals.c.
+       * info/pcterm.c (wcwidth): Make function's signature consistent
+       with Gnulib's prototype in gnulib/lib/wchar.h.
+
+       * info/session.c (w32_read): Provide prototype, to avoid compiler
+       warnings.
+
 2015-06-18  Eli Zaretskii  <address@hidden>
 
        * tp/Texinfo/Common.pm (open_out): Call binmode on opened file 

Modified: trunk/info/pcterm.c
===================================================================
--- trunk/info/pcterm.c 2015-06-19 18:42:47 UTC (rev 6347)
+++ trunk/info/pcterm.c 2015-06-20 08:06:47 UTC (rev 6348)
@@ -72,7 +72,6 @@
 
 #include "display.h"
 
-int kill (pid_t, int);
 void reset_info_window_sizes (void);
 void redisplay_after_signal (void);
 
@@ -766,7 +765,7 @@
    the binary, because it resolves the calls to this replacement
    function.  */
 int
-wcwidth (int wc)
+wcwidth (wchar_t wc)
 {
   return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
 }

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2015-06-19 18:42:47 UTC (rev 6347)
+++ trunk/info/session.c        2015-06-20 08:06:47 UTC (rev 6348)
@@ -34,6 +34,7 @@
 #ifdef __MINGW32__
 # define read(f,b,s)   w32_read(f,b,s)
 # define _read(f,b,s)  w32_read(f,b,s)
+extern ssize_t w32_read (int, void *, size_t);
 #endif
 
 #if defined (HAVE_SYS_TIME_H)

Modified: trunk/system.h
===================================================================
--- trunk/system.h      2015-06-19 18:42:47 UTC (rev 6347)
+++ trunk/system.h      2015-06-20 08:06:47 UTC (rev 6348)
@@ -164,6 +164,7 @@
 # else  /* O_BINARY && !__CYGWIN__ */
 #  ifdef __MINGW32__
 #   define SET_SCREEN_SIZE_HELPER terminal_prep_terminal()
+extern int kill (pid_t, int);
 #  endif  /* _WIN32 */
 #  define DEFAULT_TMPDIR       "c:/"
 #  define PATH_SEP     ";"




reply via email to

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