Followup changes for styled underline support

* src/nsterm.m (ns_draw_text_decoration):
* src/pgtkterm.c (pgtk_draw_glyph_string):
* src/haikuterm.c (haiku_draw_text_decoration):
* src/androidterm.c (android_draw_glyph_string):
* src/w32term.c (w32_draw_glyph_string): Use new FACE_UNDER*
constants.  (Bug#62994)

1 files changed, 3 insertions, 3 deletions

diff --git a/src/androidterm.c b/src/androidterm.c
index 5de7b6f4e14..f5173168785 100644
--- a/src/androidterm.c
+++ b/src/androidterm.c
@@ -4158,7 +4158,7 @@ android_draw_glyph_string (struct glyph_string *s)
       /* Draw underline.  */
       if (s->face->underline)
         {
-          if (s->face->underline == FACE_UNDER_WAVE)
+          if (s->face->underline == FACE_UNDERLINE_WAVE)
             {
               if (s->face->underline_defaulted_p)
                 android_draw_underwave (s, decoration_width);
@@ -4171,13 +4171,13 @@ android_draw_glyph_string (struct glyph_string *s)
                   android_set_foreground (s->gc, xgcv.foreground);
                 }
             }
-          else if (s->face->underline == FACE_UNDER_LINE)
+          else if (s->face->underline == FACE_UNDERLINE_SINGLE)
             {
               unsigned long thickness, position;
               int y;
 
               if (s->prev
-                  && s->prev->face->underline == FACE_UNDER_LINE
+                  && s->prev->face->underline == FACE_UNDERLINE_SINGLE
                   && (s->prev->face->underline_at_descent_line_p
                       == s->face->underline_at_descent_line_p)
                   && (s->prev->face->underline_pixels_above_descent_line