From 4ef36a7b4c2107306387bece0843a4a1f2bcb552 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 16 Jan 2011 23:27:25 -0800 Subject: [PATCH] * xterm.h (struct x_display_info): Remove stray semicolon. The extra semicolon didn't conform to the C standard. Problem reported by Sun cc. --- src/ChangeLog | 4 ++++ src/xterm.h | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index cb51917bb31..4b9fe9b13dc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-01-17 Paul Eggert + * 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 diff --git a/src/xterm.h b/src/xterm.h index 4f075be7fc0..4399d300834 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -270,8 +270,8 @@ struct x_display_info 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 @@ extern Lisp_Object Qx_gtk_map_stock; (nr).y = (ry), \ (nr).width = (rwidth), \ (nr).height = (rheight)) -