Merge commit 'origin/stable'

[pspp-builds.git] / src / ui / gui / var-display.c

diff --git a/src/ui/gui/var-display.c b/src/ui/gui/var-display.c
index 62c3eeee7e763e0747041723750d9a73fbdfdf18..07c7a4736ff08e8537d62182383592fc4aec0ec1 100644 (file)
--- a/src/ui/gui/var-display.c
+++ b/src/ui/gui/var-display.c
@@ -2,16 +2,16 @@
 #include "var-display.h"
 
 #include <data/variable.h>
+#include <data/format.h>
 #include <stdlib.h>
 
-#include "var-sheet.h"
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 #include "helper.h"
 
-const static gchar none[] = N_("None");
+static const gchar none[] = N_("None");
 
 gchar *
 name_to_string (const struct variable *var, GError **err)