'struct' removal

2025-01-24 01:23:03 +01:00 · 2003-09-16 10:33:33 +00:00 · 2003-09-16 10:33:33 +00:00 · 787a2f3f43
commit 787a2f3f43
parent 565ee3b932
74 changed files with 243 additions and 240 deletions
--- a/src/intl/collations/bl88591ca0.h
+++ b/src/intl/collations/bl88591ca0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591da0.h
+++ b/src/intl/collations/bl88591da0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{223, 115, 115},			/* ß -> ss */
 	{222, 84, 72},				/* Þ -> TH */
 	{254, 116, 104},			/* þ -> th */
@ -561,7 +561,7 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{65, 97},
 	 {FIRST_PRIMARY + 39, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0},
@ -578,7 +578,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591de0.h
+++ b/src/intl/collations/bl88591de0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591es0.h
+++ b/src/intl/collations/bl88591es0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,7 +561,7 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 104},
 	 {FIRST_PRIMARY + 14, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0},
@ -590,7 +590,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591fi0.h
+++ b/src/intl/collations/bl88591fi0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{223, 115, 115},			/* ß -> ss */
 	{254, 116, 104},			/* þ -> th */
 	{222, 84, 72},				/* Þ -> TH */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591fr0.h
+++ b/src/intl/collations/bl88591fr0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591is0.h
+++ b/src/intl/collations/bl88591is0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{223, 115, 115},			/* ß -> ss */
 	{198, 65, 69},				/* Æ -> AE */
 	{230, 97, 101},				/* æ -> ae */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591it0.h
+++ b/src/intl/collations/bl88591it0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591nl0.h
+++ b/src/intl/collations/bl88591nl0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591no0.h
+++ b/src/intl/collations/bl88591no0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{223, 115, 115},			/* ß -> ss */
 	{254, 116, 104},			/* þ -> th */
 	{222, 84, 72},				/* Þ -> TH */
@ -561,7 +561,7 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{97, 97},
 	 {FIRST_PRIMARY + 39, FIRST_SECONDARY + 1, FIRST_TERTIARY + 0, 0, 0},
@ -578,7 +578,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591pt0.h
+++ b/src/intl/collations/bl88591pt0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591sv0.h
+++ b/src/intl/collations/bl88591sv0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{223, 115, 115},			/* ß -> ss */
 	{254, 116, 104},			/* þ -> th */
 	{222, 84, 72},				/* Þ -> TH */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591uk0.h
+++ b/src/intl/collations/bl88591uk0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/bl88591us0.h
+++ b/src/intl/collations/bl88591us0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{198, 65, 69},				/* Æ -> AE */
 	{230, 97, 101},				/* æ -> ae */
 	{223, 115, 115},			/* ß -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/blNEXTde0.h
+++ b/src/intl/collations/blNEXTde0.h
@ -553,7 +553,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{241, 97, 101},				/* ñ -> ae */
 	{225, 65, 69},				/* á -> AE */
 	{174, 102, 105},			/* ® -> fi */
@ -566,11 +566,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/blNEXTes0.h
+++ b/src/intl/collations/blNEXTes0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{241, 97, 101},				/* ñ -> ae */
 	{225, 65, 69},				/* á -> AE */
 	{174, 102, 105},			/* ® -> fi */
@ -565,7 +565,7 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 104},
 	 {FIRST_PRIMARY + 14, FIRST_SECONDARY + 0, FIRST_TERTIARY + 0, 0, 0},
@ -594,7 +594,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/blNEXTfr0.h
+++ b/src/intl/collations/blNEXTfr0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{241, 97, 101},				/* ñ -> ae */
 	{225, 65, 69},				/* á -> AE */
 	{174, 102, 105},			/* ® -> fi */
@ -565,11 +565,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/blNEXTit0.h
+++ b/src/intl/collations/blNEXTit0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{241, 97, 101},				/* ñ -> ae */
 	{225, 65, 69},				/* á -> AE */
 	{174, 102, 105},			/* ® -> fi */
@ -565,11 +565,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_IGNORE + 0, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   0   */
 	{FIRST_IGNORE + 1, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   1   */
 	{FIRST_IGNORE + 2, NULL_SECONDARY, NULL_TERTIARY, 1, 1},	/*   2   */
--- a/src/intl/collations/blNEXTus0.h
+++ b/src/intl/collations/blNEXTus0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{225, 65, 69},				/* á -> AE */
 	{241, 97, 101},				/* ñ -> ae */
 	{251, 115, 115},			/* û -> ss */
@ -565,11 +565,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437de0.h
+++ b/src/intl/collations/db437de0.h
@ -552,16 +552,16 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437es1.h
+++ b/src/intl/collations/db437es1.h
@ -552,11 +552,11 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{67, 72},
 	 {FIRST_PRIMARY + 16, FIRST_SECONDARY + 0, NULL_TERTIARY, 0, 0},
@ -576,7 +576,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 85, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 86, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 87, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437fi0.h
+++ b/src/intl/collations/db437fi0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 83, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 84, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437fr0.h
+++ b/src/intl/collations/db437fr0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 80, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437it0.h
+++ b/src/intl/collations/db437it0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 80, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437nl0.h
+++ b/src/intl/collations/db437nl0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 80, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437sv0.h
+++ b/src/intl/collations/db437sv0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 83, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 84, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437uk0.h
+++ b/src/intl/collations/db437uk0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 80, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db437us0.h
+++ b/src/intl/collations/db437us0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850cf0.h
+++ b/src/intl/collations/db850cf0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 80, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850de0.h
+++ b/src/intl/collations/db850de0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{145, 97, 101},				/* ‘ -> ae */
 	{146, 65, 69},				/* ’ -> AE */
 	{225, 115, 115},			/* á -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 6, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 7, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 8, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850es0.h
+++ b/src/intl/collations/db850es0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{145, 97, 101},				/* ‘ -> ae */
 	{146, 65, 69},				/* ’ -> AE */
 	{225, 115, 115},			/* á -> ss */
@ -561,7 +561,7 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 104},
 	 {FIRST_PRIMARY + 14, FIRST_SECONDARY + 0, NULL_TERTIARY, 0, 0},
@ -588,7 +588,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 40, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 41, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 42, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850fr0.h
+++ b/src/intl/collations/db850fr0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{145, 97, 101},				/* ‘ -> ae */
 	{146, 65, 69},				/* ’ -> AE */
 	{225, 115, 115},			/* á -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 37, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 38, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 39, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850it1.h
+++ b/src/intl/collations/db850it1.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{145, 97, 101},				/* ‘ -> ae */
 	{146, 65, 69},				/* ’ -> AE */
 	{225, 115, 115},			/* á -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 37, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 38, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 39, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850nl0.h
+++ b/src/intl/collations/db850nl0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{145, 97, 101},				/* ‘ -> ae */
 	{146, 65, 69},				/* ’ -> AE */
 	{225, 115, 115},			/* á -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 37, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 38, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 39, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850pt0.h
+++ b/src/intl/collations/db850pt0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 3, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850sv1.h
+++ b/src/intl/collations/db850sv1.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{225, 115, 115},			/* á -> ss */
 	{231, 116, 104},			/* ç -> th */
 	{232, 84, 72},				/* è -> TH */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 45, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 46, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 47, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850uk0.h
+++ b/src/intl/collations/db850uk0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{145, 97, 101},				/* ‘ -> ae */
 	{146, 65, 69},				/* ’ -> AE */
 	{225, 115, 115},			/* á -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 37, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 38, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 39, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db850us0.h
+++ b/src/intl/collations/db850us0.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db852cz0.h
+++ b/src/intl/collations/db852cz0.h
@ -552,14 +552,14 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{225, 115, 115},			/* á -> ss */
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 104},
 	 {FIRST_PRIMARY + 10, FIRST_SECONDARY + 0, NULL_TERTIARY, 0, 0},
@ -572,7 +572,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 122, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 123, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 124, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db852po0.h
+++ b/src/intl/collations/db852po0.h
@ -552,18 +552,18 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db852sl0.h
+++ b/src/intl/collations/db852sl0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db857tr0.h
+++ b/src/intl/collations/db857tr0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 83, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db860pt0.h
+++ b/src/intl/collations/db860pt0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 3, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db863cf1.h
+++ b/src/intl/collations/db863cf1.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 76, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 77, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 78, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db865da0.h
+++ b/src/intl/collations/db865da0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 83, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db865no0.h
+++ b/src/intl/collations/db865no0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 81, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 82, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 83, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/db866ru0.h
+++ b/src/intl/collations/db866ru0.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd437intl.h
+++ b/src/intl/collations/pd437intl.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{132, 97, 101},				/* „ -> ae */
 	{142, 65, 69},				/* Ž -> AE */
 	{148, 111, 101},			/* ” -> oe */
@ -565,11 +565,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd437swedfin.h
+++ b/src/intl/collations/pd437swedfin.h
@ -552,18 +552,18 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd852czech.h
+++ b/src/intl/collations/pd852czech.h
@ -552,18 +552,18 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{225, 115, 115},			/* á -> ss */
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd852hundc.h
+++ b/src/intl/collations/pd852hundc.h
@ -552,14 +552,14 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 115},
 	 {FIRST_PRIMARY + 68, FIRST_SECONDARY + 0, NULL_TERTIARY, 0, 0},
@ -628,7 +628,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd852polish.h
+++ b/src/intl/collations/pd852polish.h
@ -552,18 +552,18 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd852slovene.h
+++ b/src/intl/collations/pd852slovene.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd861iceland.h
+++ b/src/intl/collations/pd861iceland.h
@ -552,18 +552,18 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd865nordan40.h
+++ b/src/intl/collations/pd865nordan40.h
@ -552,18 +552,18 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pd866cyrr.h
+++ b/src/intl/collations/pd866cyrr.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1250czech.h
+++ b/src/intl/collations/pw1250czech.h
@ -553,7 +553,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{223, 115, 115},			/* ß -> ss */
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
@ -561,7 +561,7 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 104},
 	 {FIRST_PRIMARY + 74, FIRST_SECONDARY + 0, NULL_TERTIARY, 0, 0},
@ -576,7 +576,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1250hun.h
+++ b/src/intl/collations/pw1250hun.h
@ -553,11 +553,11 @@ static const BYTE ToLowerConversionTbl [ LOWERCASE_LEN ] = {
   255  /*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl [ NUM_EXPAND_CHARS + 1 ] = {
+static const ExpandChar ExpansionTbl [ NUM_EXPAND_CHARS + 1 ] = {
 { 0, 0, 0 } /* END OF TABLE */
 };
-static const struct CompressPair CompressTbl [ NUM_COMPRESS_CHARS + 1 ] = {
+static const CompressPair CompressTbl [ NUM_COMPRESS_CHARS + 1 ] = {
 { { 99, 115}, { FIRST_PRIMARY+  76, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }, { FIRST_PRIMARY+  76, FIRST_SECONDARY+  0, NULL_TERTIARY,      0, 0 }}, /* cs */
 { { 67, 115}, { FIRST_PRIMARY+  76, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }, { FIRST_PRIMARY+  76, FIRST_SECONDARY+  1, NULL_TERTIARY,      0, 0 }}, /* Cs */
 { { 67,  83}, { FIRST_PRIMARY+  76, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }, { FIRST_PRIMARY+  76, FIRST_SECONDARY+  2, NULL_TERTIARY,      0, 0 }}, /* CS */
@ -585,7 +585,7 @@ static const struct CompressPair CompressTbl [ NUM_COMPRESS_CHARS + 1 ] = {
 { {0, 0}, {   0,   0,   0,   0,   0 }, {   0,   0,   0,   0,   0 } } /*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = {
+static const SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = {
 { FIRST_PRIMARY+   0, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*   0   */
 { FIRST_PRIMARY+   1, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*   1   */
 { FIRST_PRIMARY+   2, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*   2   */
--- a/src/intl/collations/pw1250hundc.h
+++ b/src/intl/collations/pw1250hundc.h
@ -552,14 +552,14 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 115},
 	 {FIRST_PRIMARY + 68, FIRST_SECONDARY + 0, NULL_TERTIARY, 0, 0},
@ -628,7 +628,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1250polish.h
+++ b/src/intl/collations/pw1250polish.h
@ -552,18 +552,18 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{146, 65, 69},				/* ’ -> AE */
 	{145, 97, 101},				/* ‘ -> ae */
 	{225, 115, 115},			/* á -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1250slov.h
+++ b/src/intl/collations/pw1250slov.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1251cyrr.h
+++ b/src/intl/collations/pw1251cyrr.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1252i850.h
+++ b/src/intl/collations/pw1252i850.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{228, 97, 101},				/* ä -> ae */
 	{196, 65, 69},				/* Ä -> AE */
 	{246, 111, 101},			/* ö -> oe */
@ -567,11 +567,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1252intl.h
+++ b/src/intl/collations/pw1252intl.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{228, 97, 101},				/* ä -> ae */
 	{196, 65, 69},				/* Ä -> AE */
 	{246, 111, 101},			/* ö -> oe */
@ -567,11 +567,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1252nor4.h
+++ b/src/intl/collations/pw1252nor4.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{222, 84, 72},				/* Þ -> TH */
 	{254, 116, 104},			/* þ -> th */
 	{198, 65, 69},				/* Æ -> AE */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1252span.h
+++ b/src/intl/collations/pw1252span.h
@ -552,14 +552,14 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{230, 97, 101},				/* æ -> ae */
 	{198, 65, 69},				/* Æ -> AE */
 	{223, 115, 115},			/* ß -> ss */
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 		{{99, 104},
 	 {FIRST_PRIMARY + 68, FIRST_SECONDARY + 0, NULL_TERTIARY, 0, 0},
@ -580,7 +580,7 @@ static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1252swfn.h
+++ b/src/intl/collations/pw1252swfn.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{254, 116, 104},			/* þ -> th */
 	{222, 84, 72},				/* Þ -> TH */
 	{198, 65, 69},				/* Æ -> AE */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1253greek1.h
+++ b/src/intl/collations/pw1253greek1.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/pw1254turk.h
+++ b/src/intl/collations/pw1254turk.h
@ -552,7 +552,7 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{228, 97, 101},				/* ä -> ae */
 	{196, 65, 69},				/* Ä -> AE */
 	{223, 83, 115},				/* ß -> Ss */
@ -561,11 +561,11 @@ static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/xx1251_ua.h
+++ b/src/intl/collations/xx1251_ua.h
@ -552,15 +552,15 @@ static const BYTE ToLowerConversionTbl[LOWERCASE_LEN] = {
 	255							/*   255 ->   255 */
 };
-static const struct ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
+static const ExpandChar ExpansionTbl[NUM_EXPAND_CHARS + 1] = {
 	{0, 0, 0}					/* END OF TABLE */
 };
-static const struct CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
+static const CompressPair CompressTbl[NUM_COMPRESS_CHARS + 1] = {
 	{{0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}	/*END OF TABLE */
 };
-static const struct SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
+static const SortOrderTblEntry NoCaseOrderTbl[NOCASESORT_LEN] = {
 	{FIRST_PRIMARY + 0, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   0   */
 	{FIRST_PRIMARY + 1, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   1   */
 	{FIRST_PRIMARY + 2, NULL_SECONDARY, NULL_TERTIARY, 0, 0},	/*   2   */
--- a/src/intl/collations/xx88592czech.h
+++ b/src/intl/collations/xx88592czech.h
@ -550,7 +550,7 @@ static const BYTE ToLowerConversionTbl [ LOWERCASE_LEN ] = {
 	255  /* 255 -> 255	( ÿ -> ÿ ) */
 };
-static const struct ExpandChar ExpansionTbl [ NUM_EXPAND_CHARS + 1 ] = {
+static const ExpandChar ExpansionTbl [ NUM_EXPAND_CHARS + 1 ] = {
 { 223, 115, 115 }, /* ß -> ss */
 { 146,  65,  69 }, /* ’ -> AE */
 { 145,  97, 101 }, /* ‘ -> ae */
@ -558,12 +558,12 @@ static const struct ExpandChar ExpansionTbl [ NUM_EXPAND_CHARS + 1 ] = {
 { 0, 0, 0 } /* END OF TABLE */
 };
-static const struct CompressPair CompressTbl [ NUM_COMPRESS_CHARS + 1 ] = {
+static const CompressPair CompressTbl [ NUM_COMPRESS_CHARS + 1 ] = {
 { {0, 0}, {   0,   0,   0,   0,   0 }, {   0,   0,   0,   0,   0 } } /*END OF TABLE */
 };
 /*1250*/
-static const struct SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = {
+static const SortOrderTblEntry NoCaseOrderTbl [ NOCASESORT_LEN ] = {
 { FIRST_PRIMARY+  0, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*   0   */
 { FIRST_PRIMARY+  1, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*   1   */
 { FIRST_PRIMARY+  2, NULL_SECONDARY,      NULL_TERTIARY,      0, 0 }, /*   2   */
--- a/src/intl/cv_unicode_fss.h
+++ b/src/intl/cv_unicode_fss.h
@ -31,13 +31,13 @@ USHORT CS_UTFFSS_unicode_to_fss(CSCONVERT obj, MBCHAR *fss_str, USHORT fss_len,
 SSHORT CS_UTFFSS_fss_mbtowc(TEXTTYPE *obj, UCS2_CHAR *wc, NCHAR *p, USHORT n);
-typedef struct {
+struct Tab {
 	int cmask;
 	int cval;
 	int shift;
 	long lmask;
 	long lval;
-} Tab;
+};
 static const Tab tab[] = {
 	{ 0x80, 0x00, 0 * 6, 0x7F, 0 },	/* 1 byte sequence */
--- a/src/intl/lc_narrow.cpp
+++ b/src/intl/lc_narrow.cpp
@ -124,7 +124,7 @@ USHORT LC_NARROW_string_to_key(TEXTTYPE obj, USHORT iInLen, BYTE *pInChar, USHOR
 	BYTE *outbuff;
 	BYTE *inbuff;
-	struct SortOrderTblEntry *coll;
+	SortOrderTblEntry* coll;
 	assert(pOutChar != NULL);
 	assert(pInChar != NULL);
@ -161,7 +161,7 @@ USHORT LC_NARROW_string_to_key(TEXTTYPE obj, USHORT iInLen, BYTE *pInChar, USHOR
 		assert(lspecial < sizeof(special));
 		coll =
-			&((struct SortOrderTblEntry *) obj->
+			&((SortOrderTblEntry*) obj->
 			  texttype_collation_table)[*pInChar];
 		if (!(coll->IsExpand || coll->IsCompress)) {
 			if (coll->Primary != NULL_WEIGHT)
@ -180,15 +180,14 @@ USHORT LC_NARROW_string_to_key(TEXTTYPE obj, USHORT iInLen, BYTE *pInChar, USHOR
 			};
 		}
 		else if (coll->IsExpand) {
-			struct ExpandChar *exp;
+			ExpandChar* exp = &((ExpandChar*) obj->texttype_expand_table)[0];
 			exp = &((struct ExpandChar *) obj->texttype_expand_table)[0];
 			while (exp->Ch && exp->Ch != *pInChar)
 				exp++;
 			assert(exp->Ch == *pInChar);
 			for (j = 0; j < 2; j++) {
 				if (j)
 					coll =
-						&((struct SortOrderTblEntry *) obj->
+						&((SortOrderTblEntry*) obj->
 						  texttype_collation_table)[exp->ExpCh2];
 				if (coll->Primary != NULL_WEIGHT)
 					outbuff[lprimary++] = coll->Primary;
@ -200,10 +199,10 @@ USHORT LC_NARROW_string_to_key(TEXTTYPE obj, USHORT iInLen, BYTE *pInChar, USHOR
 		}
 		else {					/* (col->IsCompress) */
-			struct CompressPair *cmp;
+			CompressPair* cmp;
 			if ((USHORT) (i + 1) < iInLen) {
 				cmp =
-					&((struct CompressPair *) obj->
+					&((CompressPair*) obj->
 					  texttype_compress_table)[0];
 				while (cmp->CharPair[0]) {
 					if ((cmp->CharPair[0] == *pInChar) &&
@ -294,7 +293,7 @@ USHORT LC_NARROW_string_to_key(TEXTTYPE obj, USHORT iInLen, BYTE *pInChar, USHOR
 typedef struct coltab_status {
 	USHORT stat_flags;
-	struct SortOrderTblEntry *stat_waiting;
+	SortOrderTblEntry* stat_waiting;
 } *COLSTAT;
@ -302,8 +301,8 @@ typedef struct coltab_status {
 static SSHORT special_scan(TEXTTYPE obj, USHORT l1, BYTE *s1, USHORT l2, BYTE *s2)
 {
-	struct SortOrderTblEntry *col1;
+	SortOrderTblEntry* col1;
-	struct SortOrderTblEntry *col2;
+	SortOrderTblEntry* col2;
 	USHORT index1, index2;
 	index1 = 0;
@ -313,7 +312,7 @@ static SSHORT special_scan(TEXTTYPE obj, USHORT l1, BYTE *s1, USHORT l2, BYTE *s
 		/* Scan to find ignore char from l1 */
 		while (l1) {
 			col1 =
-				&((struct SortOrderTblEntry *) obj->
+				&((SortOrderTblEntry*) obj->
 				  texttype_collation_table)[*s1];
 			if (col1->IsExpand && col1->IsCompress)
 				break;
@ -325,7 +324,7 @@ static SSHORT special_scan(TEXTTYPE obj, USHORT l1, BYTE *s1, USHORT l2, BYTE *s
 		/* Scan to find ignore char from l2 */
 		while (l2) {
 			col2 =
-				&((struct SortOrderTblEntry *) obj->
+				&((SortOrderTblEntry*) obj->
 				  texttype_collation_table)[*s2];
 			if (col2->IsExpand && col2->IsCompress)
 				break;
@ -355,9 +354,9 @@ static SSHORT special_scan(TEXTTYPE obj, USHORT l1, BYTE *s1, USHORT l2, BYTE *s
 }
-struct SortOrderTblEntry *get_coltab_entry(TEXTTYPE obj, UCHAR **p, USHORT *l, COLSTAT stat)
+SortOrderTblEntry* get_coltab_entry(TEXTTYPE obj, UCHAR **p, USHORT *l, COLSTAT stat)
 {
-	struct SortOrderTblEntry *col;
+	SortOrderTblEntry* col;
 	if (stat->stat_flags & HAVE_WAITING) {
 		(*l)--;
@ -370,7 +369,7 @@ struct SortOrderTblEntry *get_coltab_entry(TEXTTYPE obj, UCHAR **p, USHORT *l, C
 	stat->stat_waiting = NULL;
 	while (*l) {
 		col =
-			&((struct SortOrderTblEntry *) obj->
+			&((SortOrderTblEntry*) obj->
 			  texttype_collation_table)[**p];
 		if (!(col->IsExpand || col->IsCompress)) {
 			/* Have col */
@ -387,8 +386,7 @@ struct SortOrderTblEntry *get_coltab_entry(TEXTTYPE obj, UCHAR **p, USHORT *l, C
 			continue;
 		}
 		else if (col->IsExpand) {
-			struct ExpandChar *exp;
+			ExpandChar* exp = &((ExpandChar*) obj->texttype_expand_table)[0];
 			exp = &((struct ExpandChar *) obj->texttype_expand_table)[0];
 			while (exp->Ch && exp->Ch != **p)
 				exp++;
 			assert(exp->Ch == **p);
@ -396,17 +394,17 @@ struct SortOrderTblEntry *get_coltab_entry(TEXTTYPE obj, UCHAR **p, USHORT *l, C
 			/* Have waiting */
 			stat->stat_waiting =
-				&((struct SortOrderTblEntry *) obj->
+				&((SortOrderTblEntry*) obj->
 				  texttype_collation_table)[exp->ExpCh2];
 			stat->stat_flags |= HAVE_WAITING;
 			return col;
 		}
 		else {					/* (col->IsCompress) */
-			struct CompressPair *cmp;
+			CompressPair* cmp;
 			if (*l > 1) {
 				cmp =
-					&((struct CompressPair *) obj->
+					&((CompressPair*) obj->
 					  texttype_compress_table)[0];
 				while (cmp->CharPair[0]) {
 					if ((cmp->CharPair[0] == **p) &&
@ -435,8 +433,9 @@ struct SortOrderTblEntry *get_coltab_entry(TEXTTYPE obj, UCHAR **p, USHORT *l, C
 SSHORT LC_NARROW_compare(TEXTTYPE obj, USHORT l1, BYTE *s1, USHORT l2, BYTE *s2)
 {
-	struct SortOrderTblEntry *col1, *col2;
+	SortOrderTblEntry* col1;
-	struct coltab_status stat1, stat2;
+	SortOrderTblEntry* col2;
 	coltab_status stat1, stat2;
 	SSHORT save_secondary = 0;
 	SSHORT save_tertiary = 0;
 	SSHORT save_quandary = 0;
--- a/src/intl/ld.h
+++ b/src/intl/ld.h
@ -245,8 +245,8 @@ struct ExpandChar {
 struct CompressPair {
 	BYTE CharPair[2];
-	struct SortOrderTblEntry CaseWeight;
+	SortOrderTblEntry CaseWeight;
-	struct SortOrderTblEntry NoCaseWeight;
+	SortOrderTblEntry NoCaseWeight;
 };
@ -481,9 +481,13 @@ struct CompressPair {
 // VCS AREA
 //-----------------------------------------------------------------
-//	$Header: /home/job/firebird/cvs-backup/firebird2/src/intl/ld.h,v 1.20 2003-08-21 16:22:11 brodsom Exp $
+//	$Header: /home/job/firebird/cvs-backup/firebird2/src/intl/ld.h,v 1.21 2003-09-16 10:33:30 aafemt Exp $
 //	$Log: not supported by cvs2svn $
 //	Revision 1.20  2003/08/21 16:22:11  brodsom
 //	-Replace STATIC with static
 //	-Remove a few unused macros
 //	
 //	Revision 1.19  2003/02/28 12:45:35  brodsom
 //	Remove FAR_VARIABLE
 //