Don't assume that MEASURE_* and ALIGN_* have the same values found in

[pspp-builds.git] / src / output / chart.h

diff --git a/src/output/chart.h b/src/output/chart.h
index 546c6c716eccb0601f23b0ff2a5eb7f92e9e614b..0180251e26e31f5f65897ccf13e261fd770e70fb 100644 (file)
--- a/src/output/chart.h
+++ b/src/output/chart.h
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 2004 Free Software Foundation, Inc.
-   Written by John Darrington <john@darrington.wattle.id.au>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -26,9 +25,9 @@
 #include <assert.h>
 #include <math.h>
 
-#include "chart-geometry.h"
-#include "str.h"
-#include "alloc.h"
+#include <math/chart-geometry.h>
+#include <libpspp/str.h>
+#include <libpspp/alloc.h>
 #include "manager.h"
 #include "output.h"
 
@@ -47,7 +46,7 @@ struct chart {
 #else
   void *lp;
 #endif
-  char *filename;
+  char *file_name;
   FILE *file;
 
   /* The geometry of the chart