[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100541: * xterm.c (handle_one_xevent): Avoid type-punned derefencing of X events.

[Chong Yidong]

------------------------------------------------------------
revno: 100541
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-04-08 15:18:25 -0400
message:
  * xterm.c (handle_one_xevent): Avoid type-punned derefencing of X events.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-08 18:44:36 +0000
+++ b/src/ChangeLog     2011-04-08 19:18:25 +0000
@@ -1,3 +1,8 @@
+2011-04-08  Chong Yidong  <address@hidden>
+
+       * xterm.c (handle_one_xevent): Avoid type-punned derefencing of X
+       events.
+
 2011-04-08  Svante Signell  <address@hidden>  (tiny change)
 
        * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2011-01-02 23:50:46 +0000
+++ b/src/xterm.c       2011-04-08 19:18:25 +0000
@@ -4074,7 +4074,7 @@
          return XSCROLL_BAR (bar);
     }
 
-  return 0;
+  return NULL;
 }
 
 
@@ -6086,7 +6086,7 @@
         goto OTHER;
 #endif /* USE_X_TOOLKIT */
       {
-        XSelectionClearEvent *eventp = (XSelectionClearEvent *) &event;
+        XSelectionClearEvent *eventp = &(event.xselectionclear);
 
         inev.ie.kind = SELECTION_CLEAR_EVENT;
         SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display;
@@ -6103,8 +6103,7 @@
         goto OTHER;
 #endif /* USE_X_TOOLKIT */
       {
-          XSelectionRequestEvent *eventp
-            = (XSelectionRequestEvent *) &event;
+         XSelectionRequestEvent *eventp = &(event.xselectionrequest);
 
           inev.ie.kind = SELECTION_REQUEST_EVENT;
           SELECTION_EVENT_DISPLAY (&inev.sie) = eventp->display;