[Emacs-diffs] /srv/bzr/emacs/trunk r102875: * xterm.h (struct x_display_info): Remove stray semicolon.

[Paul Eggert]

------------------------------------------------------------
revno: 102875 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-16 23:28:25 -0800
message:
  * xterm.h (struct x_display_info): Remove stray semicolon.
modified:
  src/ChangeLog
  src/xterm.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-17 07:16:08 +0000
+++ b/src/ChangeLog     2011-01-17 07:27:25 +0000
@@ -1,5 +1,9 @@
 2011-01-17  Paul Eggert  <address@hidden>
 
+       * xterm.h (struct x_display_info): Remove stray semicolon.
+       The extra semicolon didn't conform to the C standard.
+       Problem reported by Sun cc.
+
        * lisp.h: Redo flags and XSET slightly to avoid overflow diagnostics.
        These changes make compilation easier to follow with Sun cc.
        (ARRAY_MARK_FLAG): Make it signed, so that it can be assigned to

=== modified file 'src/xterm.h'
--- a/src/xterm.h       2011-01-15 23:16:57 +0000
+++ b/src/xterm.h       2011-01-17 07:27:25 +0000
@@ -270,8 +270,8 @@
   Atom Xatom_Scrollbar;
 
   /* Atom used in XEmbed client messages.  */
-  Atom Xatom_XEMBED, Xatom_XEMBED_INFO;;
- 
+  Atom Xatom_XEMBED, Xatom_XEMBED_INFO;
+
   /* The frame (if any) which has the X window that has keyboard focus.
      Zero if none.  This is examined by Ffocus_frame in xfns.c.  Note
      that a mere EnterNotify event can set this; if you need to know the
@@ -1112,4 +1112,3 @@
    (nr).y = (ry),                                      \
    (nr).width = (rwidth),                              \
    (nr).height = (rheight))
-