X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fgnumeric-reader.c;h=61fbab899b8bd44eff63633bdb0f90a57a2553d4;hb=71eea20b080f51f1aa00ef35acf4f49ce742d10a;hp=9772d82af576f36af9219c06ee15d2e196f93529;hpb=0655c32db3a849462fbcebd73d8c659d814e794d;p=pspp

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 9772d82af5..61fbab899b 100644
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -18,10 +18,10 @@
 
 #include <config.h>
 
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
 
-#include "minmax.h"
+#include "gl/minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -40,26 +40,24 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 
 #else
 
+#include "data/gnumeric-reader.h"
+
 #include <assert.h>
 #include <stdbool.h>
 #include <errno.h>
-
-#include <xalloc.h>
-
 #include <libxml/xmlreader.h>
 #include <zlib.h>
 
-#include <data/case.h>
-#include <data/casereader-provider.h>
-#include <data/dictionary.h>
-#include <data/identifier.h>
-#include <data/variable.h>
-#include <data/value.h>
+#include "data/case.h"
+#include "data/casereader-provider.h"
+#include "data/dictionary.h"
+#include "data/identifier.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/i18n.h"
+#include "libpspp/str.h"
 
-#include <libpspp/i18n.h>
-#include <libpspp/str.h>
-
-#include "gnumeric-reader.h"
+#include "gl/xalloc.h"
 
 /* Default width of string variables. */
 #define GNUMERIC_DEFAULT_WIDTH 8
@@ -498,9 +496,8 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 
 
   /* Create the dictionary and populate it */
-  *dict = r->dict = dict_create ();
-
-  dict_set_encoding (r->dict, CHAR_CAST (const char *, xmlTextReaderConstEncoding (r->xtr)));
+  *dict = r->dict = dict_create (
+    CHAR_CAST (const char *, xmlTextReaderConstEncoding (r->xtr)));
 
   for (i = 0 ; i < n_var_specs ; ++i )
     {