X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata-in.h;h=287b2fbeda7bf180543c895b483c7cfd2fb82886;hb=012b055f5f7b4ddd2a608e64c53eaae101b5634e;hp=c520920522838d4e3b82f90521251ff675eefd75;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp-builds.git

diff --git a/src/data-in.h b/src/data-in.h
index c5209205..287b2fbe 100644
--- a/src/data-in.h
+++ b/src/data-in.h
@@ -14,25 +14,28 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #if !data_in_h
 #define data_in_h 1
 
+#include <stddef.h>
+#include <stdbool.h>
 #include "format.h"
 
 /* Flags. */
 enum
   {
     DI_IGNORE_ERROR = 01,	/* Don't report errors to the user. */
+    DI_IMPLIED_DECIMALS = 02    /* Insert decimals if no '.' in input. */
   };
 
 /* Information about parsing one data field. */
 struct data_in
   {
-    const unsigned char *s;	/* Source start. */
-    const unsigned char *e;	/* Source end. */
+    const char *s;              /* Source start. */
+    const char *e;              /* Source end. */
 
     union value *v;		/* Destination. */
 
@@ -41,19 +44,9 @@ struct data_in
     struct fmt_spec format;	/* Format specification to use. */
   };
 
-int data_in (struct data_in *);
+bool data_in (struct data_in *);
 
 void data_in_finite_line (struct data_in *di, const char *line, size_t len,
 			  int fc, int lc);
 
-#if __GNUC__ >= 2
-extern inline void
-data_in_finite_line (struct data_in *di, const char *line, size_t len,
-		     int fc, int lc)
-{
-  di->s = line + ((size_t) fc <= len ? fc - 1 : len);
-  di->e = line + ((size_t) lc <= len ? lc : len);
-}
-#endif /* GNU C */
-
 #endif /* data-in.h */