[Emacs-diffs] /srv/bzr/emacs/trunk r110347: Fix compilation warnings in the MS-Windows build.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110347
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-02 19:55:29 +0200
message:
  Fix compilation warnings in the MS-Windows build.
  
   src/w32proc.c (sys_wait): Declare 'signame' 'const char *', to be
   consistent with the change in return value of 'safe_strsignal'.
  
   nt/preprep.c (RVA_TO_PTR): Cast the result to 'void *', to avoid
   compiler warnings when using the value.
modified:
  nt/ChangeLog
  nt/preprep.c
  src/ChangeLog
  src/w32proc.c

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-10-01 11:37:37 +0000
+++ b/nt/ChangeLog      2012-10-02 17:55:29 +0000
@@ -1,3 +1,8 @@
+2012-10-02  Eli Zaretskii  <address@hidden>
+
+       * preprep.c (RVA_TO_PTR): Cast the result to 'void *', to avoid
+       compiler warnings when using the value.
+
 2012-10-01  Eli Zaretskii  <address@hidden>
 
        * preprep.c (RVA_TO_PTR): Use 'unsigned char *' instead of

=== modified file 'nt/preprep.c'
--- a/nt/preprep.c      2012-10-01 11:37:37 +0000
+++ b/nt/preprep.c      2012-10-02 17:55:29 +0000
@@ -288,7 +288,7 @@
   ((DWORD_PTR)(rva) - (section)->VirtualAddress)
 
 #define RVA_TO_PTR(var,section,filedata) \
-  ((unsigned char *)(RVA_TO_OFFSET(var,section) + (filedata)->file_base))
+  ((void *)((unsigned char *)(RVA_TO_OFFSET(var,section) + 
(filedata)->file_base)))
 
 /* Convert address in executing image to RVA.  */
 #define PTR_TO_RVA(ptr) ((DWORD_PTR)(ptr) - (DWORD_PTR) GetModuleHandle (NULL))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-02 06:55:27 +0000
+++ b/src/ChangeLog     2012-10-02 17:55:29 +0000
@@ -1,3 +1,8 @@
+2012-10-02  Eli Zaretskii  <address@hidden>
+
+       * w32proc.c (sys_wait): Declare 'signame' 'const char *', to be
+       consistent with the change in return value of 'safe_strsignal'.
+
 2012-10-02  Paul Eggert  <address@hidden>
 
        Prefer plain 'static' to 'static inline' (Bug#12541).

=== modified file 'src/w32proc.c'
--- a/src/w32proc.c     2012-10-01 21:09:30 +0000
+++ b/src/w32proc.c     2012-10-02 17:55:29 +0000
@@ -1132,7 +1132,7 @@
       else if (WIFSIGNALED (retval))
        {
          int code = WTERMSIG (retval);
-         char *signame;
+         const char *signame;
 
          synchronize_system_messages_locale ();
          signame = strsignal (code);