Fix step-over-{trips-on-watchpoint|lands-on-breakpoint}.exp race

[deliverable/binutils-gdb.git] / gdb / ui-out.c

diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 887260079ec4fda1cebaec94efeacdcc5022eb1c..a18fe2e2c2b688977851017782f4c5bb103c77c2 100644 (file)
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -31,7 +31,7 @@ struct ui_out_hdr
   {
     int colno;
     int width;
-    int alignment;
+    enum ui_align alignment;
     char *col_name;
     char *colhdr;
     struct ui_out_hdr *next;
@@ -269,14 +269,14 @@ static void uo_data_destroy (struct ui_out *uiout);
 
 extern void _initialize_ui_out (void);
 static void append_header_to_list (struct ui_out *uiout, int width,
-                                  int alignment, const char *col_name,
+                                  enum ui_align alignment, const char *col_name,
                                   const char *colhdr);
 static int get_next_header (struct ui_out *uiout, int *colno, int *width,
-                           int *alignment, char **colhdr);
+                           enum ui_align *alignment, char **colhdr);
 static void clear_header_list (struct ui_out *uiout);
 static void clear_table (struct ui_out *uiout);
 static void verify_field (struct ui_out *uiout, int *fldno, int *width,
-                         int *align);
+                         enum ui_align *align);
 
 /* exported functions (ui_out API) */
 
@@ -395,7 +395,7 @@ specified after table_body."));
   {
     int fldno;
     int width;
-    int align;
+    enum ui_align align;
 
     verify_field (uiout, &fldno, &width, &align);
   }
@@ -470,7 +470,7 @@ ui_out_field_int (struct ui_out *uiout,
 {
   int fldno;
   int width;
-  int align;
+  enum ui_align align;
 
   verify_field (uiout, &fldno, &width, &align);
 
@@ -486,7 +486,7 @@ ui_out_field_fmt_int (struct ui_out *uiout,
 {
   int fldno;
   int width;
-  int align;
+  enum ui_align align;
 
   verify_field (uiout, &fldno, &width, &align);
 
@@ -530,7 +530,7 @@ ui_out_field_skip (struct ui_out *uiout,
 {
   int fldno;
   int width;
-  int align;
+  enum ui_align align;
 
   verify_field (uiout, &fldno, &width, &align);
 
@@ -544,7 +544,7 @@ ui_out_field_string (struct ui_out *uiout,
 {
   int fldno;
   int width;
-  int align;
+  enum ui_align align;
 
   verify_field (uiout, &fldno, &width, &align);
 
@@ -560,7 +560,7 @@ ui_out_field_fmt (struct ui_out *uiout,
   va_list args;
   int fldno;
   int width;
-  int align;
+  enum ui_align align;
 
   /* Will not align, but has to call anyway.  */
   verify_field (uiout, &fldno, &width, &align);
@@ -956,7 +956,7 @@ clear_header_list (struct ui_out *uiout)
 static void
 append_header_to_list (struct ui_out *uiout,
                       int width,
-                      int alignment,
+                      enum ui_align alignment,
                       const char *col_name,
                       const char *colhdr)
 {
@@ -1002,7 +1002,7 @@ static int
 get_next_header (struct ui_out *uiout,
                 int *colno,
                 int *width,
-                int *alignment,
+                enum ui_align *alignment,
                 char **colhdr)
 {
   /* There may be no headers at all or we may have used all columns.  */
@@ -1023,7 +1023,8 @@ get_next_header (struct ui_out *uiout,
    available/applicable).  */
 
 static void
-verify_field (struct ui_out *uiout, int *fldno, int *width, int *align)
+verify_field (struct ui_out *uiout, int *fldno, int *width,
+             enum ui_align *align)
 {
   struct ui_out_level *current = current_level (uiout);
   char *text;