X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fchart.h;h=23c64d06129d1d7acb83cb957a81991d4af2f00e;hb=f5c108becd49d78f4898cab11352291f5689d24e;hp=546c6c716eccb0601f23b0ff2a5eb7f92e9e614b;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/output/chart.h b/src/output/chart.h
index 546c6c71..23c64d06 100644
--- 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,13 +46,13 @@ struct chart {
 #else
   void *lp;
 #endif
-  char *filename;
+  char *file_name;
   FILE *file;
 
-  /* The geometry of the chart 
+  /* The geometry of the chart
      See diagram at the foot of this file.
    */
-  
+
   int data_top   ;
   int data_right ;
   int data_bottom;
@@ -68,9 +67,9 @@ struct chart {
   int legend_left ;
   int legend_right ;
 
-  
+
   /* Default font size for the plot (if zero, then use plotter default) */
-  int font_size; 
+  int font_size;
 
   char fill_colour[10];