table: Rename TAB_* to TABLE_CELL_* and reduce from 16 to 8 bits each.

[pspp] / src / output / pivot-output.c

diff --git a/src/output/pivot-output.c b/src/output/pivot-output.c
index c3751d04d888dff563b28a1155c18143c64f8b80..59a2dd4e2a4b9ac95dea2c193ea15600b59d02db 100644 (file)
--- a/src/output/pivot-output.c
+++ b/src/output/pivot-output.c
@@ -116,9 +116,9 @@ fill_cell (struct table *t, int x1, int y1, int x2, int y2,
            int style_idx, const struct pivot_value *value,
            bool rotate_label)
 {
-  int options = style_idx << TAB_STYLE_SHIFT;
+  int options = style_idx << TABLE_CELL_STYLE_SHIFT;
   if (rotate_label)
-    options |= TAB_ROTATE;
+    options |= TABLE_CELL_ROTATE;
 
   table_put (t, x1, y1, x2, y2, options, value);
 }
@@ -127,9 +127,9 @@ static void
 fill_cell_owned (struct table *t, int x1, int y1, int x2, int y2,
                  int style_idx, struct string *s, bool rotate_label)
 {
-  int options = style_idx << TAB_STYLE_SHIFT;
+  int options = style_idx << TABLE_CELL_STYLE_SHIFT;
   if (rotate_label)
-    options |= TAB_ROTATE;
+    options |= TABLE_CELL_ROTATE;
 
   table_put_owned (t, x1, y1, x2, y2, options,
                    pivot_value_new_user_text_nocopy (ds_steal_cstr (s)));