X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdata-out.h;h=b18d067436fbb9b95a3cc5a9043ea20560b26632;hb=8b585b7a6ae9d1a90386d56e3ce484cf8204743a;hp=71cbbac3d5307e1c6bbba422443ea494e930e26e;hpb=f15c854d8500105766b2f5666bb62b983ff24f88;p=pspp

diff --git a/src/data/data-out.h b/src/data/data-out.h
index 71cbbac3d5..b18d067436 100644
--- a/src/data/data-out.h
+++ b/src/data/data-out.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, 2011, 2013 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,18 +18,21 @@
 #define DATA_OUT_H 1
 
 #include <stdbool.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/legacy-encoding.h>
+#include "libpspp/float-format.h"
+#include "libpspp/integer-format.h"
 
 struct fmt_spec;
+struct string;
 union value;
 
-char * data_out (const union value *, const struct fmt_spec *);
+char * data_out (const union value *, const char *encoding, const struct fmt_spec *);
 
-char * data_out_pool (const union value *, const struct fmt_spec *, struct pool *pool);
+char * data_out_pool (const union value *, const char *encoding, const struct fmt_spec *, struct pool *pool);
 
-void data_out_legacy (const union value *input, const char *encoding,
-		      const struct fmt_spec *format, char *output);
+char *data_out_stretchy (const union value *, const char *encoding, const struct fmt_spec *, struct pool *);
+
+void data_out_recode (const union value *input, const char *input_encoding,
+                      const struct fmt_spec *,
+                      struct string *output, const char *output_encoding);
 
 #endif /* data-out.h */