[PATCH] cli-out.c compilation error

["Philippe De Muyter" <phdm at macqel dot be>]

Trying to compile gdb taken from cvs 2000-02-19 01:00 (GMT + 1), I get the
following errors :

gcc -c -g -O2 -W -Wall    -I. -I/share/src/gnu/src/gdb -I/share/src/gnu/src/gdb/config -DHAVE_CONFIG_H -I/share/src/gnu/src/gdb/../include/opcode -I/share/src/gnu/src/gdb/../readline/.. -I../bfd -I/share/src/gnu/src/gdb/../bfd  -I/share/src/gnu/src/gdb/../include -I../intl -I/share/src/gnu/src/gdb/../intl -I/share/src/gnu/src/gdb/tui    /share/src/gnu/src/gdb/cli-out.c
/share/src/gnu/src/gdb/cli-out.c: In function `cli_table_header':
/share/src/gnu/src/gdb/cli-out.c:137: argument `alignment' doesn't match prototype
/share/src/gnu/src/gdb/cli-out.c:44: prototype declaration
/share/src/gnu/src/gdb/cli-out.c: In function `cli_field_int':
/share/src/gnu/src/gdb/cli-out.c:170: argument `alignment' doesn't match prototype
/share/src/gnu/src/gdb/cli-out.c:48: prototype declaration
/share/src/gnu/src/gdb/cli-out.c: In function `cli_field_skip':
/share/src/gnu/src/gdb/cli-out.c:186: argument `alignment' doesn't match prototype
/share/src/gnu/src/gdb/cli-out.c:50: prototype declaration
/share/src/gnu/src/gdb/cli-out.c: At top level:
/share/src/gnu/src/gdb/cli-out.c:200: conflicting types for `cli_field_string'
/share/src/gnu/src/gdb/cli-out.c:53: previous declaration of `cli_field_string'
gnumake[1]: *** [cli-out.o] Error 1


Can someone commit the following fix ? (I do not yet have my-side ssh ready)


Sat Feb 19 12:14:41 2000  Philippe De Muyter  <phdm@macqel.be>

	* cli-out.c (cli_table_header): Type of parameter `alignment' is
 	`enum ui_align', not `int'.
	(cli_field_string, cli_field_skip): Likewise.

--- ./gdb/cli-out.c	Sat Feb 19 12:12:15 2000
+++ ./gdb/cli-out.c	Sat Feb 19 12:10:33 2000
@@ -132,7 +132,7 @@ cli_table_end (uiout)
 cli_table_header (uiout, width, alignment, colhdr)
      struct ui_out *uiout;
      int width;
-     int alignment;
+     enum ui_align alignment;
      char *colhdr;
 {
   cli_field_string (uiout, 0, width, alignment, 0, colhdr);
@@ -164,7 +164,7 @@ cli_field_int (uiout, fldno, width, alig
      struct ui_out *uiout;
      int fldno;
      int width;
-     int alignment;
+     enum ui_align alignment;
      char *fldname;
      int value;
 {
@@ -181,7 +181,7 @@ cli_field_skip (uiout, fldno, width, ali
      struct ui_out *uiout;
      int fldno;
      int width;
-     int alignment;
+     enum ui_align alignment;
      char *fldname;
 {
   cli_field_string (uiout, fldno, width, alignment, fldname, "");
@@ -194,7 +194,7 @@ cli_field_skip (uiout, fldno, width, ali
 cli_field_string (struct ui_out *uiout,
 		  int fldno,
 		  int width,
-		  int align,
+		  enum ui_align align,
 		  char *fldname,
 		  const char *string)
 {