[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master b591977: Assume C89 offsetof in xterm.c, xlwmenu.c
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master b591977: Assume C89 offsetof in xterm.c, xlwmenu.c |
Date: |
Tue, 14 Apr 2015 07:58:48 +0000 |
branch: master
commit b5919771aea2d43c64be381b7d7b395eeb1191bd
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Assume C89 offsetof in xterm.c, xlwmenu.c
* lwlib/xlwmenu.c (offset):
* src/xterm.c (cvt_string_to_pixel_args):
Use offsetof, not XtOffset.
---
lwlib/xlwmenu.c | 2 +-
src/xterm.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 9317dea..61f175b 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -105,7 +105,7 @@ xlwMenuTranslations [] =
/* FIXME: F10 should enter the menu, the first one in the menu-bar. */
-#define offset(field) XtOffset(XlwMenuWidget, field)
+#define offset(field) offsetof (XlwMenuRec, field)
static XtResource
xlwMenuResources[] =
{
diff --git a/src/xterm.c b/src/xterm.c
index e904343..48b250b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1378,9 +1378,9 @@ x_alloc_lighter_color_for_widget (Widget widget, Display
*display, Colormap cmap
static XtConvertArgRec cvt_string_to_pixel_args[] =
{
- {XtWidgetBaseOffset, (XtPointer) XtOffset (Widget, core.screen),
+ {XtWidgetBaseOffset, (XtPointer) offsetof (WidgetRec, core.screen),
sizeof (Screen *)},
- {XtWidgetBaseOffset, (XtPointer) XtOffset (Widget, core.colormap),
+ {XtWidgetBaseOffset, (XtPointer) offsetof (WidgetRec, core.colormap),
sizeof (Colormap)}
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master b591977: Assume C89 offsetof in xterm.c, xlwmenu.c,
Paul Eggert <=