emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] /srv/bzr/emacs/trunk r105693: src/frame.c (x_report_frame_


From: Eli Zaretskii
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r105693: src/frame.c (x_report_frame_params): Cast to avoid compiler warnings.
Date: Fri, 09 Sep 2011 11:32:43 +0300
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 105693
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-09 11:32:43 +0300
message:
  src/frame.c (x_report_frame_params): Cast to avoid compiler warnings.
modified:
  src/ChangeLog
  src/frame.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-09 01:06:52 +0000
+++ b/src/ChangeLog     2011-09-09 08:32:43 +0000
@@ -1,3 +1,7 @@
+2011-09-09  Eli Zaretskii  <address@hidden>
+
+       * frame.c (x_report_frame_params): Cast to avoid compiler warnings.
+
 2011-09-08  Martin Rudalics  <address@hidden>
 
        * window.c (Fset_window_prev_buffers, Fset_window_next_buffers):

=== modified file 'src/frame.c'
--- a/src/frame.c       2011-09-09 01:06:52 +0000
+++ b/src/frame.c       2011-09-09 08:32:43 +0000
@@ -3098,7 +3098,11 @@
                      for non-toolkit scroll bar.
                      ruler-mode.el depends on this.  */
                   : Qnil));
-  w = FRAME_X_WINDOW (f);
+  /* FRAME_X_WINDOW is not guaranteed to return an integer.  E.g., on
+     MS-Windows it returns a value whose type is HANDLE, which is
+     actually a pointer.  Explicit casting avoids compiler
+     warnings.  */
+  w = (unsigned long) FRAME_X_WINDOW (f);
   sprintf (buf, "%lu", w);
   store_in_alist (alistptr, Qwindow_id,
                  build_string (buf));
@@ -3108,7 +3112,7 @@
   if (FRAME_X_OUTPUT (f)->widget)
 #endif
     {
-      w = FRAME_OUTER_WINDOW (f);
+      w = (unsigned long) FRAME_OUTER_WINDOW (f);
       sprintf (buf, "%lu", w);
     }
   store_in_alist (alistptr, Qouter_window_id,


reply via email to

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