Constness and global namespace patrol.

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

diff --git a/src/output/postscript.c b/src/output/postscript.c
index d65162dad4c3e1bd8fd0cb2b687b4fef0276f283..b658cdf3d2f669693a5036b96791831211dc7b91 100644 (file)
--- a/src/output/postscript.c
+++ b/src/output/postscript.c
@@ -27,6 +27,7 @@
 #include <unistd.h>
 
 #include <libpspp/alloc.h>
+#include <libpspp/assertion.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
 #include <libpspp/freaderror.h>
@@ -108,8 +109,7 @@ struct ps_driver_ext
 
     struct font *fonts[OUTP_FONT_CNT];
     int last_font;              /* Index of last font set with setfont. */
-  }
-ps_driver_ext;
+  };
 
 /* Transform logical y-ordinate Y into a page ordinate. */
 #define YT(Y) (this->length - (Y))
@@ -374,7 +374,7 @@ handle_option (struct outp_driver *this, const char *key,
            this->font_height = arg;
            break;
          default:
-           abort ();
+           NOT_REACHED ();
          }
       }
       break;
@@ -400,7 +400,7 @@ handle_option (struct outp_driver *this, const char *key,
            x->line_width = dimension;
            break;
          default:
-           abort ();
+           NOT_REACHED ();
          }
       }
       break;
@@ -417,7 +417,7 @@ handle_option (struct outp_driver *this, const char *key,
       }
       break;
     default:
-      abort ();
+      NOT_REACHED ();
     }
 
   return true;
@@ -608,8 +608,7 @@ ps_submit (struct outp_driver *this UNUSED, struct som_entity *s)
     case SOM_CHART:
       break;
     default:
-      abort ();
-      break;
+      NOT_REACHED ();
     }
 }
 \f