diff options
| -rw-r--r-- | grid.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -247,7 +247,7 @@ GridLastChar (Widget w) (cs)->ascent|(cs)->descent) == 0)) #define CI_GET_CHAR_INFO_1D(fs,col,cs) \ -{ \ +do { \ cs = NULL; \ if (col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \ if (fs->per_char == NULL) { \ @@ -258,14 +258,14 @@ GridLastChar (Widget w) if (CI_NONEXISTCHAR(cs)) \ cs = NULL; \ } \ -} +} while (0) /* * CI_GET_CHAR_INFO_2D - return the charinfo struct for the indicated row and * column. This is used for fonts that have more than row zero. */ #define CI_GET_CHAR_INFO_2D(fs,row,col,cs) \ -{ \ +do { \ cs = NULL; \ if (row >= fs->min_byte1 && row <= fs->max_byte1 && \ col >= fs->min_char_or_byte2 && col <= fs->max_char_or_byte2) { \ @@ -280,7 +280,7 @@ GridLastChar (Widget w) if (CI_NONEXISTCHAR(cs)) \ cs = NULL; \ } \ -} +} while (0) static Boolean GridHasChar (Widget w, long ch) @@ -389,7 +389,7 @@ static XtConvertArgRec xftColorConvertArgs[] = { }; #define donestr(type, value, tstr) \ - { \ + do { \ if (toVal->addr != NULL) { \ if (toVal->size < sizeof(type)) { \ toVal->size = sizeof(type); \ @@ -406,7 +406,7 @@ static XtConvertArgRec xftColorConvertArgs[] = { } \ toVal->size = sizeof(type); \ return True; \ - } + } while (0) static void XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure, |