Fix merge problems

[pspp-builds.git] / src / output / output.h

diff --git a/src/output/output.h b/src/output/output.h
index 2338a0d87bf64e761023a49772f99a3d89ac7fd9..fc66874068da031cafef1743406131c486ee504d 100644 (file)
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -17,8 +17,6 @@
 #ifndef OUTPUT_OUTPUT_H
 #define OUTPUT_OUTPUT_H 1
 
-#include <config.h>
-
 #include <libpspp/str.h>
 
 
@@ -152,8 +150,8 @@ bool outp_parse_options (struct substring options,
                          struct outp_driver *);
 int outp_match_keyword (const char *, const struct outp_option *, int *);
 
-int outp_evaluate_dimension (char *, char **);
-bool outp_get_paper_size (char *, int *h, int *v);
+int outp_evaluate_dimension (const char *);
+bool outp_get_paper_size (const char *, int *h, int *v);
 
 void outp_open_page (struct outp_driver *);
 void outp_close_page (struct outp_driver *);