X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fgnumeric-reader.c;h=8faffe6676ed29294b7fa28b4c946ab7639c3807;hb=3b6384c0f3f35fb0b280cb20ddaa01b50912f4b8;hp=2356adcc761c421c9414eea081dbb56b6bb815c8;hpb=b07fb20788e26c4cdc462d73edef28d7b2442db1;p=pspp diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c index 2356adcc76..8faffe6676 100644 --- a/src/data/gnumeric-reader.c +++ b/src/data/gnumeric-reader.c @@ -28,7 +28,7 @@ #include "spreadsheet-reader.h" -#if !GNM_SUPPORT +#if !GNM_READ_SUPPORT struct casereader * gnumeric_open_reader (const struct spreadsheet_read_options *opts, struct dictionary **dict) @@ -629,6 +629,7 @@ struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet, const struct spreadsheet_read_options *opts) { + int type = 0; int x = 0; struct gnumeric_reader *r = NULL; unsigned long int vstart = 0; @@ -696,7 +697,7 @@ gnumeric_make_reader (struct spreadsheet *spreadsheet, n_cases --; } - int type = 0; + /* Read in the first row of cells, including the headers if read_names was set */ while ( @@ -952,4 +953,4 @@ gnm_file_casereader_read (struct casereader *reader UNUSED, void *r_) } -#endif /* GNM_SUPPORT */ +#endif /* GNM_READ_SUPPORT */