[Bug-indent] Indent 2.2.8 bug

[Albert Chin-A-Young]

1. [src/comments.c]
   No C++ comments in C code
2. [src/output.c, src/indent.h]
   The IBM C compiler has a problem with defining a function as
   both static and extern:
    xlc -DHAVE_CONFIG_H -DLOCALEDIR=\"/opt/TWWfsw/indent2/share/locale\"
    -I. -I. -I.. -I. -I. -I.. -I../intl -I../intl    -O2 -qmaxmem=-1
    -qarch=com -c `test -f output.c || echo './'`output.c
    "output.c", line 23.24: 1506-334 (S) Identifier output has already
    been defined on line 96 of "indent.h".
    gmake[2]: *** [output.o] Error 1

-- 
albert chin (address@hidden)

-- snip snip
--- src/comments.c.orig Sun Jun  2 12:38:25 2002
+++ src/comments.c      Sun Jun  2 12:44:21 2002
@@ -259,17 +259,17 @@
             format = settings.format_col1_comments;
             start_column = 1;
         }
-        // else if (s_com != e_com)
-        //{
-            /* The input has a line consisting of two contiguous comments.
-             * In this case, we don't try too hard, 'cause nothing will
-             * look good. */
+        /* else if (s_com != e_com) */
+        /*  { */
+        /*    /* The input has a line consisting of two contiguous comments. */
+        /*     * In this case, we don't try too hard, 'cause nothing will */
+        /*     * look good. */
             
-        //  format = 0;
+        /*    format = 0; */
             
-        //  start_column = found_column;
-        //  two_contiguous_comments = 1;
-        //}
+        /*    start_column = found_column; */
+        /*    two_contiguous_comments = 1; */
+        /*  } */
         else
         {
             format = settings.format_comments;
--- src/output.c.orig   Sun Jun  2 12:54:43 2002
+++ src/output.c        Sun Jun  2 12:55:05 2002
@@ -13,6 +13,7 @@
 #include <utime.h>
 #include <sys/stat.h>
 
+#define OUTPUT_DEFINED = 1
 #include "indent.h"
 #include "sys.h"
 #include "globs.h"
--- src/indent.h.orig   Sun Jun  2 12:54:40 2002
+++ src/indent.h        Sun Jun  2 12:55:20 2002
@@ -93,7 +93,9 @@
 extern unsigned long in_prog_size;
 
 /* The output file. */
+#ifndef OUTPUT_DEFINED
 extern FILE *output;
+#endif