X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fdata%2Fdata-in.h;h=af62b3aecba9ec019356d179005b8a633184de36;hb=4e8efdc4acb80fc1a3735228d29fca0cf86fee6d;hp=3ebd5933c43b0370e29cfd279cd3b22fcdbb0b4d;hpb=6549c9aced0949b16abb372257772fc0893e02bb;p=pspp diff --git a/src/data/data-in.h b/src/data/data-in.h index 3ebd5933c4..af62b3aecb 100644 --- a/src/data/data-in.h +++ b/src/data/data-in.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,19 +18,19 @@ #define DATA_DATA_IN_H 1 #include -#include -#include -#include -#include -#include +#include "data/format.h" +#include "libpspp/legacy-encoding.h" +#include "libpspp/str.h" -enum fmt_type; union value; struct dictionary; + bool data_in (struct substring input, const char *encoding, - enum fmt_type, int implied_decimals, - int first_column, int last_column, - const struct dictionary *dict, - union value *output, int width); + enum fmt_type, int first_column, int last_column, + const struct dictionary *dict, + union value *output, int width); + +void data_in_imply_decimals (struct substring input, const char *encoding, + enum fmt_type format, int d, union value *output); #endif /* data/data-in.h */