From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 8 Nov 2008 23:26:40 +0000 (+0900)
Subject: Fixed problems when configured with --without-libplot
X-Git-Tag: v0.7.1~50^2~15
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8af5c0889486280ecb843d9ceec6e8bb8a6e20d2;p=pspp-builds.git

Fixed problems when configured with --without-libplot
---

diff --git a/src/output/charts/dummy-chart.c b/src/output/charts/dummy-chart.c
index 9d4f722b..e22f958f 100644
--- a/src/output/charts/dummy-chart.c
+++ b/src/output/charts/dummy-chart.c
@@ -33,80 +33,87 @@
 #endif
 
 void
-chart_write_title(struct chart *chart UNUSED, const char *title UNUSED, ...)
+chart_write_title (struct chart *chart UNUSED, const char *title UNUSED, ...)
 {
 }
 
 
 void
-chart_write_xscale(struct chart *ch UNUSED,
-                   double min UNUSED, double max UNUSED, int ticks UNUSED)
+chart_write_xscale (struct chart *ch UNUSED,
+		    double min UNUSED, double max UNUSED, int ticks UNUSED)
 {
 }
 
 
 void
-chart_write_yscale(struct chart *ch UNUSED UNUSED,
-                   double smin UNUSED, double smax UNUSED, int ticks UNUSED)
+chart_write_yscale (struct chart *ch UNUSED UNUSED,
+		    double smin UNUSED, double smax UNUSED, int ticks UNUSED)
 {
 }
 
 
 void
-chart_write_xlabel(struct chart *ch UNUSED, const char *label UNUSED)
+chart_write_xlabel (struct chart *ch UNUSED, const char *label UNUSED)
 {
 }
 
 void
-chart_write_ylabel(struct chart *ch UNUSED, const char *label UNUSED)
+chart_write_ylabel (struct chart *ch UNUSED, const char *label UNUSED)
 {
 }
 
 
 void
-chart_line(struct chart *ch UNUSED,
-           double slope UNUSED, double intercept UNUSED,
-	   double limit1 UNUSED, double limit2 UNUSED,
-           enum CHART_DIM lim_dim UNUSED)
+chart_line (struct chart *ch UNUSED,
+	    double slope UNUSED, double intercept UNUSED,
+	    double limit1 UNUSED, double limit2 UNUSED,
+	    enum CHART_DIM lim_dim UNUSED)
 {
 }
 
 
 void
-chart_datum(struct chart *ch UNUSED, int dataset UNUSED UNUSED,
-            double x UNUSED, double y UNUSED)
+chart_datum (struct chart *ch UNUSED, int dataset UNUSED UNUSED,
+	     double x UNUSED, double y UNUSED)
 {
 }
 
-struct normal_curve;
+void
+histogram_plot (const struct histogram *hist UNUSED,
+		const char *label UNUSED,
+		const struct moments1 *m UNUSED)
+{
+}
 
 void
-histogram_plot(const gsl_histogram *hist UNUSED,
-	       const char *factorname UNUSED,
-	       const struct normal_curve *norm UNUSED,
-               short show_normal UNUSED)
+histogram_plot_n (const struct histogram *hist UNUSED,
+		  const char *label UNUSED,
+		  double n UNUSED, double mean UNUSED, double stddev UNUSED,
+		  bool show_normal UNUSED)
 {
 }
 
+
 void
-boxplot_draw_yscale(struct chart *ch UNUSED,
-                    double y_max UNUSED, double y_min UNUSED)
+boxplot_draw_yscale (struct chart *ch UNUSED,
+		     double y_max UNUSED, double y_min UNUSED)
 {
 }
 
 void
-boxplot_draw_boxplot(struct chart *ch UNUSED,
-		     double box_centre UNUSED,
-		     double box_width UNUSED,
-		     struct metrics *m UNUSED,
-		     const char *name UNUSED)
+boxplot_draw_boxplot (struct chart *ch UNUSED,
+		      double box_centre UNUSED,
+		      double box_width UNUSED,
+		      const struct box_whisker *w UNUSED,
+		      const char *name UNUSED)
 {
 }
 
 
 
+
 void
-piechart_plot(const char *title UNUSED,
-              const struct slice *slices UNUSED, int n_slices UNUSED)
+piechart_plot (const char *title UNUSED,
+	       const struct slice *slices UNUSED, int n_slices UNUSED)
 {
 }
diff --git a/src/output/charts/plot-hist.c b/src/output/charts/plot-hist.c
index e7dcd438..4b11618a 100644
--- a/src/output/charts/plot-hist.c
+++ b/src/output/charts/plot-hist.c
@@ -122,6 +122,8 @@ histogram_plot (const struct histogram *hist,
   histogram_plot_n (hist, label, n, mean, sqrt(var), m);
 }
 
+
+/* This function is deprecated.  Don't use it in new code */
 void
 histogram_plot_n (const struct histogram *hist,
 		  const char *label,
diff --git a/src/output/dummy-chart.c b/src/output/dummy-chart.c
index 6d4ff931..7758ad70 100644
--- a/src/output/dummy-chart.c
+++ b/src/output/dummy-chart.c
@@ -38,6 +38,6 @@ chart_init_separate (struct chart *ch UNUSED, const char *type UNUSED,
 }
 
 void
-chart_finalise_separate (struct chart *ch)
+chart_finalise_separate (struct chart *ch UNUSED)
 {
 }