projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
[pspp-builds.git]
/
src
/
output
/
output.h
diff --git
a/src/output/output.h
b/src/output/output.h
index f7504bce0dba4dd48c80ac77c887d0da8c0cb12d..fc66874068da031cafef1743406131c486ee504d 100644
(file)
--- 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/>. */
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>
#include <libpspp/str.h>
@@
-134,6
+132,7
@@
extern char *outp_subtitle;
void outp_init (void);
void outp_read_devices (void);
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);
void outp_done (void);
void outp_configure_clear (void);
@@
-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 *);
struct outp_driver *);
int outp_match_keyword (const char *, const struct outp_option *, int *);
-int outp_evaluate_dimension (c
har *, char *
*);
-bool outp_get_paper_size (char *, int *h, int *v);
+int outp_evaluate_dimension (c
onst char
*);
+bool outp_get_paper_size (c
onst c
har *, int *h, int *v);
void outp_open_page (struct outp_driver *);
void outp_close_page (struct outp_driver *);
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 *);
/* Imported from som-frnt.c. */
void som_destroy_driver (struct outp_driver *);
-#endif /* output.h */
+#endif /* output
/output
.h */