X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Foutput.h;h=be84d0d5a860cf7601cd7e062d3df03f676d052e;hb=c532b2e8445401a2613391cda5ab485f9055b484;hp=6782a11e66fe93a552ee85b27989e4aa1f4de821;hpb=c708736bdd0fea4b79f3ee4a10e00c3abb95d9e3;p=pspp-builds.git diff --git a/src/output/output.h b/src/output/output.h index 6782a11e..be84d0d5 100644 --- a/src/output/output.h +++ b/src/output/output.h @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -42,7 +41,7 @@ enum outp_justification OUTP_CENTER, /* Center justification. */ }; -enum outp_font +enum outp_font { OUTP_FIXED, /* Fixed-width font. */ OUTP_PROPORTIONAL, /* Proportional font. */ @@ -78,7 +77,7 @@ struct outp_class /* special != 0 only. */ void (*submit) (struct outp_driver *, struct som_entity *); - + /* special == 0 only. */ void (*line) (struct outp_driver *, int x0, int y0, int x1, int y1, enum outp_line_style top, enum outp_line_style left, @@ -103,7 +102,7 @@ enum struct outp_driver { struct outp_driver *next, *prev; /* List of drivers. */ - struct outp_class *class; /* Driver class. */ + const struct outp_class *class; /* Driver class. */ char *name; /* Name of this driver. */ bool page_open; /* 1=page is open, 0=page is closed. */ int device; /* Zero or more of OUTP_DEV_*. */ @@ -128,8 +127,6 @@ struct outp_option int subcat; /* Subcategory. */ }; -/* List of configured output drivers. */ -extern struct outp_driver *outp_driver_list; /* Title, subtitle. */ extern char *outp_title; @@ -152,7 +149,7 @@ bool outp_parse_options (struct substring options, bool (*) (struct outp_driver *, const char *key, const struct string *value), struct outp_driver *); -int outp_match_keyword (const char *, struct outp_option *, int *); +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);