[PATCH] Groff compile fixes for latest CVS GCC

[Art Haas]

Hi.

The GCC-3.5 compiler gives errors that these variables are using
anonymous types, and building the current CVS groff code fails.
The simple patches below add in a type, and the compiler builds
groff.

Art Haas

Index: src/libs/libgroff/glyphuni.cpp
===================================================================
RCS file: /var/cvs/groff/src/libs/libgroff/glyphuni.cpp,v
retrieving revision 1.2
diff -u -r1.2 glyphuni.cpp
--- src/libs/libgroff/glyphuni.cpp      28 Dec 2003 07:14:49 -0000      1.2
+++ src/libs/libgroff/glyphuni.cpp      6 Apr 2004 21:19:53 -0000
@@ -34,7 +34,7 @@
 
 PTABLE(glyph_to_unicode) glyph_to_unicode_table;
 
-struct {
+struct S {
   const char *key;
   const char *value;
 } glyph_to_unicode_list[] = {
Index: src/libs/libgroff/uniglyph.cpp
===================================================================
RCS file: /var/cvs/groff/src/libs/libgroff/uniglyph.cpp,v
retrieving revision 1.2
diff -u -r1.2 uniglyph.cpp
--- src/libs/libgroff/uniglyph.cpp      28 Dec 2003 07:14:49 -0000      1.2
+++ src/libs/libgroff/uniglyph.cpp      6 Apr 2004 21:19:54 -0000
@@ -34,7 +34,7 @@
 
 PTABLE(unicode_to_glyph) unicode_to_glyph_table;
 
-struct {
+struct S {
   const char *key;
   const char *value;
 } unicode_to_glyph_list[] = {
Index: src/libs/libgroff/uniuni.cpp
===================================================================
RCS file: /var/cvs/groff/src/libs/libgroff/uniuni.cpp,v
retrieving revision 1.1
diff -u -r1.1 uniuni.cpp
--- src/libs/libgroff/uniuni.cpp        2 Dec 2003 19:37:25 -0000       1.1
+++ src/libs/libgroff/uniuni.cpp        6 Apr 2004 21:19:59 -0000
@@ -39,7 +39,7 @@
 
 // the first digit in the composite string gives the number of composites
 
-struct {
+struct S {
   const char *key;
   const char *value;
 } unicode_decompose_list[] = {
Index: src/preproc/eqn/box.cpp
===================================================================
RCS file: /var/cvs/groff/src/preproc/eqn/box.cpp,v
retrieving revision 1.1
diff -u -r1.1 box.cpp
--- src/preproc/eqn/box.cpp     15 Apr 2003 15:13:41 -0000      1.1
+++ src/preproc/eqn/box.cpp     6 Apr 2004 21:20:01 -0000
@@ -80,7 +80,7 @@
 
 int nroff = 0;                 // should we grok ndefine or tdefine?
 
-struct {
+struct S {
   const char *name;
   int *ptr;
 } param_table[] = {
Index: src/preproc/grn/hgraph.cpp
===================================================================
RCS file: /var/cvs/groff/src/preproc/grn/hgraph.cpp,v
retrieving revision 1.1
diff -u -r1.1 hgraph.cpp
--- src/preproc/grn/hgraph.cpp  15 Apr 2003 15:13:44 -0000      1.1
+++ src/preproc/grn/hgraph.cpp  6 Apr 2004 21:20:04 -0000
@@ -43,7 +43,7 @@
 extern int ybottom;
 extern int xleft;
 extern int xright;
-extern enum {
+extern enum E {
   OUTLINE, FILL, BOTH
 } polyfill;
 
Index: src/preproc/grn/main.cpp
===================================================================
RCS file: /var/cvs/groff/src/preproc/grn/main.cpp,v
retrieving revision 1.1
diff -u -r1.1 main.cpp
--- src/preproc/grn/main.cpp    15 Apr 2003 15:13:44 -0000      1.1
+++ src/preproc/grn/main.cpp    6 Apr 2004 21:20:08 -0000
@@ -160,7 +160,7 @@
 double scale = 1.0;            /* no scaling, default */
 int defpoint = 0;              /* flag for pointsize scaling */
 char *defstipple = (char *) 0;
-enum {
+enum E {
   OUTLINE, FILL, BOTH
 } polyfill;
 
Index: src/preproc/refer/command.cpp
===================================================================
RCS file: /var/cvs/groff/src/preproc/refer/command.cpp,v
retrieving revision 1.1
diff -u -r1.1 command.cpp
--- src/preproc/refer/command.cpp       15 Apr 2003 15:13:51 -0000      1.1
+++ src/preproc/refer/command.cpp       6 Apr 2004 21:20:10 -0000
@@ -632,7 +632,7 @@
 ? means that the previous argument is optional, * means that the
 previous argument can occur any number of times. */
 
-struct {
+struct S {
   const char *name;
   command_t func;
   const char *arg_types;
Index: src/utils/hpftodit/hpuni.cpp
===================================================================
RCS file: /var/cvs/groff/src/utils/hpftodit/hpuni.cpp,v
retrieving revision 1.1
diff -u -r1.1 hpuni.cpp
--- src/utils/hpftodit/hpuni.cpp        27 Dec 2003 05:46:59 -0000      1.1
+++ src/utils/hpftodit/hpuni.cpp        6 Apr 2004 21:20:14 -0000
@@ -33,7 +33,7 @@
 
 PTABLE(hp_msl_to_unicode) hp_msl_to_unicode_table;
 
-struct {
+struct S {
   const char *key;
   const char *value;
 } hp_msl_to_unicode_list[] = {
Index: src/utils/tfmtodit/tfmtodit.cpp
===================================================================
RCS file: /var/cvs/groff/src/utils/tfmtodit/tfmtodit.cpp,v
retrieving revision 1.1
diff -u -r1.1 tfmtodit.cpp
--- src/utils/tfmtodit/tfmtodit.cpp     15 Apr 2003 15:14:26 -0000      1.1
+++ src/utils/tfmtodit/tfmtodit.cpp     6 Apr 2004 21:20:16 -0000
@@ -650,7 +650,7 @@
 gives the groff name of the character, `i' gives its index in
 the encoding, which is filled in later  (-1 if it does not appear). */
 
-struct {
+struct S {
   const char *ch;
   int i;
 } lig_chars[] = {
@@ -670,7 +670,7 @@
 
 // Each possible ligature appears in this table.
 
-struct {
+struct S2 {
   unsigned char c1, c2, res;
   const char *ch;
 } lig_table[] = {
-- 
Man once surrendering his reason, has no remaining guard against absurdities
the most monstrous, and like a ship without rudder, is the sport of every wind.

-Thomas Jefferson to James Smith, 1822