Merge commit 'origin/master' into charset
[pspp-builds.git] / src / output / charts / plot-chart.c
index 9978c8c97747a51af578b6173446b11045876075..3b4f1b377a12a624ceb929d00c617bb4bd581f30 100644 (file)
 
 
 #include <libpspp/str.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <output/manager.h>
 #include <output/output.h>
 
-
-const char *const data_colour[] = {
-  "brown",
-  "red",
-  "orange",
-  "yellow",
-  "green",
-  "blue",
-  "violet",
-  "grey",
-  "pink"
-};
+#include "xalloc.h"
+
+const char *const data_colour[N_CHART_COLOURS] =
+  {
+    "brown",
+    "red",
+    "orange",
+    "yellow",
+    "green",
+    "blue",
+    "violet",
+    "grey",
+    "pink"
+  };