diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-06-08 15:53:10 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-08 15:53:10 +0000 |
| commit | 5423136a6407bfb5654234a8a3dcd4a46b4b1201 (patch) | |
| tree | 8de67c63f9e607c6eb673c4abd1400746d5bfc09 | |
| parent | 4c44845a850b935b28ce7b8665356223a32224fd (diff) | |
| parent | 0b3cd20be5249c51ec981a66c07a39d54d1d1c9d (diff) | |
| download | pango-5423136a6407bfb5654234a8a3dcd4a46b4b1201.tar.gz | |
Merge branch 'master' into 'master'
Replace fallthrough comments with G_GNUC_FALLTHROUGH
See merge request GNOME/pango!177
| -rw-r--r-- | examples/cairotwisted.c | 4 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | pango/break.c | 6 | ||||
| -rw-r--r-- | pango/pango-renderer.c | 2 | ||||
| -rw-r--r-- | tests/testboundaries_ucd.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/examples/cairotwisted.c b/examples/cairotwisted.c index d2d1cd30..1572c89a 100644 --- a/examples/cairotwisted.c +++ b/examples/cairotwisted.c @@ -234,7 +234,7 @@ parametrize_path (cairo_path_t *path) case CAIRO_PATH_CLOSE_PATH: /* Make it look like it's a line_to to last_move_to */ data = (&last_move_to) - 1; - /* fall through */ + G_GNUC_FALLTHROUGH; case CAIRO_PATH_LINE_TO: parametrization[i] = two_points_distance (¤t_point, &data[1]); current_point = data[1]; @@ -361,7 +361,7 @@ point_on_path (parametrized_path_t *param, case CAIRO_PATH_CLOSE_PATH: /* Make it look like it's a line_to to last_move_to */ data = (&last_move_to) - 1; - /* fall through */ + G_GNUC_FALLTHROUGH; case CAIRO_PATH_LINE_TO: { ratio = the_x / parametrization[i]; diff --git a/meson.build b/meson.build index 904027ba..c427842a 100644 --- a/meson.build +++ b/meson.build @@ -190,7 +190,7 @@ endif # Dependencies pango_deps = [] -glib_req_version = '>= 2.59.2' +glib_req_version = '>= 2.60' fribidi_req_version = '>= 0.19.7' libthai_req_version = '>= 0.1.9' harfbuzz_req_version = '>= 2.0.0' diff --git a/pango/break.c b/pango/break.c index 5aa9d41e..875d776c 100644 --- a/pango/break.c +++ b/pango/break.c @@ -404,7 +404,7 @@ pango_default_break (const gchar *text, GB_type = GB_Prepend; break; } - /* fall through */ + G_GNUC_FALLTHROUGH; case G_UNICODE_CONTROL: case G_UNICODE_LINE_SEPARATOR: case G_UNICODE_PARAGRAPH_SEPARATOR: @@ -420,7 +420,7 @@ pango_default_break (const gchar *text, GB_type = GB_ControlCRLF; break; } - /* fall through */ + G_GNUC_FALLTHROUGH; case G_UNICODE_OTHER_LETTER: if (makes_hangul_syllable) @@ -597,7 +597,7 @@ pango_default_break (const gchar *text, case G_UNICODE_CONTROL: if (wc != 0x000D && wc != 0x000A && wc != 0x000B && wc != 0x000C && wc != 0x0085) break; - /* fall through */ + G_GNUC_FALLTHROUGH; case G_UNICODE_LINE_SEPARATOR: case G_UNICODE_PARAGRAPH_SEPARATOR: WB_type = WB_NewlineCRLF; /* CR, LF, Newline */ diff --git a/pango/pango-renderer.c b/pango/pango-renderer.c index 6c0786c5..539df34a 100644 --- a/pango/pango-renderer.c +++ b/pango/pango-renderer.c @@ -227,7 +227,7 @@ draw_underline (PangoRenderer *renderer, rect->y + 2 * rect->height, rect->width, rect->height); - /* Fall through */ + G_GNUC_FALLTHROUGH; case PANGO_UNDERLINE_SINGLE: case PANGO_UNDERLINE_LOW: case PANGO_UNDERLINE_SINGLE_LINE: diff --git a/tests/testboundaries_ucd.c b/tests/testboundaries_ucd.c index ee5617bc..f77abdcd 100644 --- a/tests/testboundaries_ucd.c +++ b/tests/testboundaries_ucd.c @@ -104,7 +104,7 @@ parse_line (gchar *line, { case 0x00f7: /* DIVISION SIGN: boundary here */ temp_attr.bits |= bits.bits; - /* fall through */ + G_GNUC_FALLTHROUGH; case 0x00d7: /* MULTIPLICATION SIGN: no boundary here */ break; |