Remove useless parens in #if "defined" operator.

[pspp-builds.git] / src / output / ascii.c

diff --git a/src/output/ascii.c b/src/output/ascii.c
index e4b10270dc25cac3d3a01360da462ed598be31ea..9252cd79bdb9dacfb034c359a44ea07d60e3659c 100644 (file)
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -26,6 +25,7 @@
 
 #include <data/file-name.h>
 #include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
 #include <libpspp/pool.h>
 #include <libpspp/start-date.h>
@@ -246,7 +246,7 @@ enum
     output_file_arg
   };
 
-static struct outp_option option_tab[] =
+static const struct outp_option option_tab[] =
   {
     {"headers", boolean_arg, 0},
     {"paginate", boolean_arg, 1},
@@ -323,7 +323,7 @@ handle_option (struct outp_driver *this, const char *key,
            this->width = arg;
            break;
          default:
-           abort ();
+           NOT_REACHED ();
          }
       }
       break;
@@ -365,7 +365,7 @@ handle_option (struct outp_driver *this, const char *key,
            x->tab_width = arg;
            break;
          default:
-           abort ();
+           NOT_REACHED ();
          }
       }
       break;
@@ -395,12 +395,12 @@ handle_option (struct outp_driver *this, const char *key,
             x->squeeze_blank_lines = setting;
             break;
          default:
-           abort ();
+           NOT_REACHED ();
          }
       }
       break;
     default:
-      abort ();
+      NOT_REACHED ();
     }
 
   return true;
@@ -511,7 +511,7 @@ text_draw (struct outp_driver *this,
       x += width - length;
       break;
     default:
-      abort ();
+      NOT_REACHED ();
     }
 
   if (y >= this->length || x >= this->width)
@@ -733,7 +733,7 @@ ascii_chart_finalise (struct outp_driver *d UNUSED, struct chart *ch UNUSED)
   
 }
 
-struct outp_class ascii_class =
+const struct outp_class ascii_class =
 {
   "ascii",
   0,