X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Foutput.h;h=fc66874068da031cafef1743406131c486ee504d;hb=10064a4e800b3bc43d69107e12aa35e877059dd8;hp=7215cb6ca3797cb3f006437a9278791ed503854e;hpb=458d169f64134f4e0a9d9b72398666a01761fcf8;p=pspp-builds.git

diff --git a/src/output/output.h b/src/output/output.h
index 7215cb6c..fc668740 100644
--- a/src/output/output.h
+++ b/src/output/output.h
@@ -14,10 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-#if !output_h
-#define output_h 1
-
-#include <config.h>
+#ifndef OUTPUT_OUTPUT_H
+#define OUTPUT_OUTPUT_H 1
 
 #include <libpspp/str.h>
 
@@ -134,6 +132,7 @@ extern char *outp_subtitle;
 
 void outp_init (void);
 void outp_read_devices (void);
+void outp_configure_driver_line (struct substring);
 void outp_done (void);
 
 void outp_configure_clear (void);
@@ -142,7 +141,7 @@ void outp_configure_macro (char *);
 
 void outp_list_classes (void);
 
-void outp_enable_device (int enable, int device);
+void outp_enable_device (bool enable, int device);
 struct outp_driver *outp_drivers (struct outp_driver *);
 
 bool outp_parse_options (struct substring options,
@@ -151,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 *);
@@ -164,4 +163,4 @@ int outp_string_width (struct outp_driver *, const char *, enum outp_font);
 /* Imported from som-frnt.c. */
 void som_destroy_driver (struct outp_driver *);
 
-#endif /* output.h */
+#endif /* output/output.h */