$OpenBSD: patch-html_tbl_c,v 1.1 2005/03/07 21:30:00 fgsch Exp $
--- html_tbl.c.orig	Sun Jan  2 17:17:25 2005
+++ html_tbl.c	Mon Mar  7 18:00:27 2005
@@ -41,43 +41,7 @@
 #define R_ALL		3
 #define R_GROUPS	4
 
-/* prototype */
-void get_align(char *, int *);
-void get_valign(char *, int *);
-void get_c_width(char *, int *, int);
-void free_table(struct table *);
-void expand_cells(struct table *, int, int);
-struct table_cell *new_cell(struct table *, int, int);
-void new_columns(struct table *, int, int, int, int, int);
-void set_td_width(struct table *, int, int, int);
-unsigned char *skip_element(unsigned char *, unsigned char *, unsigned char *, int);
-void get_cell_widths(struct table *);
-void dst_width(int *, int, int, int *);
-int get_vline_width(struct table *, int);
-int get_hline_width(struct table *, int);
-int g_get_vline_pad(struct table *, int, int *, int *);
-int g_get_hline_pad(struct table *, int, int *, int *);
-int get_column_widths(struct table *);
-void get_table_width(struct table *);
-void distribute_widths(struct table *, int);
-void check_table_widths(struct table *);
-void get_table_heights(struct table *);
-void display_complicated_table(struct table *, int, int, int *);
-void get_table_frame(struct table *, signed char *, signed char *);
-void display_table_frames(struct table *, int, int);
-void add_to_rect_sets(struct rect_set ***, int *, struct rect *);
-void add_to_cell_sets(struct table_cell ****, int **, int *, struct rect *, struct table_cell *);
-void table_mouse_event(struct f_data_c *, struct g_object_table *, int, int, int);
-void draw_rect_set(struct graphics_device *, struct background *, struct rect_set *, int, int);
-void draw_rect_sets(struct graphics_device *, struct background *, struct rect_set **, int, int, int);
-void table_draw(struct f_data_c *, struct g_object_table *, int, int);
-void table_destruct(struct g_object_table *);
-void table_get_list(struct g_object_table *, void (*)(struct g_object *, struct g_object *));
-struct table *new_table(void);
 
-void get_cell_width(char *, char *, int, int, int, int *, int *, int, int *, unsigned char *);
-
-
 void get_align(char *attr, int *a)
 {
 	char *al;
@@ -196,6 +160,44 @@ struct table {
 	int nr_cells;
 #endif
 };
+
+/* prototype */
+void get_align(char *, int *);
+void get_valign(char *, int *);
+void get_c_width(char *, int *, int);
+void free_table(struct table *);
+void expand_cells(struct table *, int, int);
+struct table_cell *new_cell(struct table *, int, int);
+void new_columns(struct table *, int, int, int, int, int);
+void set_td_width(struct table *, int, int, int);
+unsigned char *skip_element(unsigned char *, unsigned char *, unsigned char *, int);
+void get_cell_widths(struct table *);
+void dst_width(int *, int, int, int *);
+int get_vline_width(struct table *, int);
+int get_hline_width(struct table *, int);
+int g_get_vline_pad(struct table *, int, int *, int *);
+int g_get_hline_pad(struct table *, int, int *, int *);
+int get_column_widths(struct table *);
+void get_table_width(struct table *);
+void distribute_widths(struct table *, int);
+void check_table_widths(struct table *);
+void get_table_heights(struct table *);
+void display_complicated_table(struct table *, int, int, int *);
+void get_table_frame(struct table *, signed char *, signed char *);
+void display_table_frames(struct table *, int, int);
+#ifdef G
+void add_to_rect_sets(struct rect_set ***, int *, struct rect *);
+void add_to_cell_sets(struct table_cell ****, int **, int *, struct rect *, struct table_cell *);
+void table_mouse_event(struct f_data_c *, struct g_object_table *, int, int, int);
+void draw_rect_set(struct graphics_device *, struct background *, struct rect_set *, int, int);
+void draw_rect_sets(struct graphics_device *, struct background *, struct rect_set **, int, int, int);
+void table_draw(struct f_data_c *, struct g_object_table *, int, int);
+void table_destruct(struct g_object_table *);
+void table_get_list(struct g_object_table *, void (*)(struct g_object *, struct g_object *));
+#endif
+struct table *new_table(void);
+
+void get_cell_width(char *, char *, int, int, int, int *, int *, int, int *, unsigned char *);
 
 #ifdef DEBUG
 #define CELL(t, x, y) (((x) < 0 || (x) >= (t)->rx || (y) < 0 || (y) >= (t)->ry) ? (internal("accessing cell out of table (%d,%d) - limit (%d,%d)", (x), (y), (t)->rx, (t)->ry), (t)->cells) : &(t)->cells[(y) * (t)->rx + (x)])
