Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / data / data-out.h

diff --git a/src/data/data-out.h b/src/data/data-out.h
index 735679b41257b78d0918ae4c83e29c90eeb62546..7dff441289c76e6b155719d230f1e776762499e0 100644 (file)
--- 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 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,19 @@
 #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 char *encoding, const struct fmt_spec *);
 
 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);
+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 */