Rename table headers with tbl suffix.

3 files changed, 11 insertions, 12 deletions

diff --git a/tools/makecrct.c b/tools/makecrct.c
index 62a5a31f82..77116f78ca 100644
--- a/tools/makecrct.c
+++ b/tools/makecrct.c
@@ -112,9 +112,9 @@ static void make_crc_table() {
 
 static void print_crc32_tables() {
     int k;
-    printf("#ifndef CRC32_H_\n");
-    printf("#define CRC32_H_\n\n");
-    printf("/* crc32.h -- tables for rapid CRC calculation\n");
+    printf("#ifndef CRC32_TBL_H_\n");
+    printf("#define CRC32_TBL_H_\n\n");
+    printf("/* crc32_tbl.h -- tables for rapid CRC calculation\n");
     printf(" * Generated automatically by makecrct.c\n */\n\n");
 
     /* print CRC table */
@@ -136,7 +136,7 @@ static void print_crc32_tables() {
         write_table(crc_comb[k], GF2_DIM);
     }
     printf("  }\n};\n");
-    printf("#endif /* CRC32_H_ */\n");
+    printf("#endif /* CRC32_TBL_H_ */\n");
 }
 
 static void write_table(const uint32_t *table, int k) {
diff --git a/tools/makefixed.c b/tools/makefixed.c
index 66f4355dc1..4cc89a456c 100644
--- a/tools/makefixed.c
+++ b/tools/makefixed.c
@@ -38,15 +38,15 @@ void ZLIB_INTERNAL buildfixedtables(struct inflate_state *state) {
 }
 
 
-//  Create fixed tables on the fly and write out a inffixed.h file that is #include'd above.
-//  makefixed() writes those tables to stdout, which would be piped to inffixed.h.
+//  Create fixed tables on the fly and write out a inffixed_tbl.h file that is #include'd above.
+//  makefixed() writes those tables to stdout, which would be piped to inffixed_tbl.h.
 void makefixed(void) {
     unsigned low, size;
     struct inflate_state state;
 
     memset(&state, 0, sizeof(state));
     buildfixedtables(&state);
-    puts("    /* inffixed.h -- table for decoding fixed codes");
+    puts("    /* inffixed_tbl.h -- table for decoding fixed codes");
     puts("     * Generated automatically by makefixed().");
     puts("     */");
     puts("");
@@ -82,9 +82,8 @@ void makefixed(void) {
     puts("\n    };");
 }
 
-// The output of this application can be piped out to recreate inffixed.h
+// The output of this application can be piped out to recreate inffixed_tbl.h
 int main(void) {
     makefixed();
     return 0;
 }
-
diff --git a/tools/maketrees.c b/tools/maketrees.c
index 150e026684..c60cc130ab 100644
--- a/tools/maketrees.c
+++ b/tools/maketrees.c
@@ -101,8 +101,8 @@ static void tr_static_init(void) {
 static void gen_trees_header() {
     int i;
 
-    printf("#ifndef TREES_H_\n");
-    printf("#define TREES_H_\n\n");
+    printf("#ifndef TREES_TBL_H_\n");
+    printf("#define TREES_TBL_H_\n\n");
 
     printf("/* header created automatically with maketrees.c */\n\n");
 
@@ -136,7 +136,7 @@ static void gen_trees_header() {
         printf("%5d%s", base_dist[i], SEPARATOR(i, D_CODES-1, 10));
     }
 
-    printf("#endif /* TREES_H_ */\n");
+    printf("#endif /* TREES_TBL_H_ */\n");
 }
 
 // The output of this application can be piped out to recreate trees.h